Ignored revisions: 12346
included in: 222649
changeset:   16606:a30ae2124d66
tag:         tip
parent:      16604:4e0e64f8f16b
parent:      16605:a095d1a2a2e8
user:        Dave Parks 
date:        Thu Mar 03 16:15:37 2011 -0600
summary:     merge

included in: 222649
changeset:   16605:a095d1a2a2e8
parent:      16602:5f8b97cfa0d7
user:        Dave Parks 
date:        Thu Mar 03 16:14:52 2011 -0600
summary:     SH-1085 Fix for crash when unchecking "mirror."  Basically got LLFace to be paranoid about who gets to touch its LLVertexBuffer members.

Found Known Changeset:
codeticket:  222384
included in: 222649
changeset:   16602:5f8b97cfa0d7
user:        Dave Parks 
date:        Tue Mar 01 16:04:25 2011 -0600
summary:     SH-1068 Disable DoF when underwater (shader doesn't have enough information to execute).

Found Known Changeset:
codeticket:  222387
included in: 222649
changeset:   16604:4e0e64f8f16b
parent:      16603:068038b860d0
parent:      16602:5f8b97cfa0d7
user:        leyla_linden
date:        Tue Mar 01 14:32:49 2011 -0800
summary:     Merge