Ignored revisions: 12346
included in: 223239
changeset:   16681:5e3407f6a421
tag:         tip
parent:      16679:14d4c6d96b54
parent:      16680:7ba177426755
user:        Dave Parks 
date:        Wed Mar 09 14:18:59 2011 -0600
summary:     merge

included in: 223239
changeset:   16680:7ba177426755
parent:      16618:e55dfe78c9bd
user:        Dave Parks 
date:        Wed Mar 09 14:18:39 2011 -0600
summary:     SH-587 Make cancel button on physics tabs more responsive.

Found Known Changeset:
codeticket:  223115
included in: 223239
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

Found Known Changeset:
codeticket:  223229
included in: 223239
changeset:   16679:14d4c6d96b54
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