Ignored revisions: 12346
included in: 223229
changeset:   16679:14d4c6d96b54
tag:         tip
parent:      16618:e55dfe78c9bd
parent:      16678:73f42030a5c5
user:        Loren Shih 
date:        Wed Mar 09 11:24:54 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

Found Known Changeset:
codeticket:  223190
included in: 223229
changeset:   16678:73f42030a5c5
user:        Merov Linden 
date:        Tue Mar 08 17:00:39 2011 -0800
summary:     STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error)

Found Known Changeset:
codeticket:  223115
included in: 223229
changeset:   16618:e55dfe78c9bd
user:        Dave Parks 
date:        Tue Mar 08 14:15:24 2011 -0600
summary:     Make DoF focal point match behavior described in test plan at http://wiki.secondlife.com/wiki/Depth_of_Field_test