Ignored revisions: 12346
included in: 223535
changeset:   16708:7558fdb39750
tag:         tip
parent:      16706:12183f51a3e5
parent:      16707:c0d6a5f2a05d
user:        Dave Parks 
date:        Fri Mar 11 16:39:24 2011 -0600
summary:     merge

included in: 223535
changeset:   16707:c0d6a5f2a05d
parent:      16691:e8ca3d30fffe
user:        Dave Parks 
date:        Fri Mar 11 16:39:03 2011 -0600
summary:     SH-477 Put estimated streaming cost back in the debug display -- use newfangled equation.

Found Known Changeset:
codeticket:  223313
included in: 223535
changeset:   16691:e8ca3d30fffe
user:        Dave Parks 
date:        Thu Mar 10 11:55:46 2011 -0600
summary:     SH-874 Followup -- fix for mac build

Found Known Changeset:
codeticket:  223502
included in: 223535
changeset:   16706:12183f51a3e5
parent:      16702:dd0b0ce64884
parent:      16705:344d4c6d7d7e
user:        Loren Shih 
date:        Fri Mar 11 12:05:41 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development