Ignored revisions: 12346
included in: 223315
changeset:   16694:e1bdcc906e9f
tag:         tip
parent:      16693:1655c1c75a4f
parent:      16691:e8ca3d30fffe
user:        prep 
date:        Thu Mar 10 13:04:36 2011 -0500
summary:     merge

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

included in: 223315
changeset:   16693:1655c1c75a4f
parent:      16692:709c77a30c12
parent:      16689:66a540fa445f
user:        prep 
date:        Thu Mar 10 12:10:29 2011 -0500
summary:     merge

Found Known Changeset:
codeticket:  223311
included in: 223315
changeset:   16689:66a540fa445f
parent:      16687:5259ec9b0750
parent:      16688:7e1a1edd318d
user:        Dave Parks 
date:        Thu Mar 10 00:42:08 2011 -0600
summary:     merge

included in: 223315
changeset:   16692:709c77a30c12
parent:      16618:e55dfe78c9bd
user:        prep 
date:        Thu Mar 10 12:09:29 2011 -0500
summary:     Fix for sh-1119: Alt Zooming on assets that contain a pivot point can at times cause erratic camera movement

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