Ignored revisions: 12346
included in: 222037
changeset:   16586:b0d66e4df62e
tag:         tip
parent:      16583:50eac09294be
parent:      16585:46e60e1b82fc
user:        Xiaohong Bao 
date:        Thu Feb 24 16:21:19 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/mesh-development

included in: 222037
changeset:   16585:46e60e1b82fc
parent:      16581:2fc7625fb0a1
parent:      16584:1bc100746447
user:        Xiaohong Bao 
date:        Thu Feb 24 16:20:43 2011 -0700
summary:     Merge

codeticket:  221902
included in: 222037
changeset:   16584:1bc100746447
parent:      16570:00d6a54738ba
user:        Xiaohong Bao 
date:        Wed Feb 23 11:41:13 2011 -0700
summary:     separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.

Found Known Changeset:
codeticket:  221808
included in: 221902
changeset:   16570:00d6a54738ba
parent:      16557:c10d5e37db1e
parent:      16569:abe208938600
user:        Xiaohong Bao 
date:        Tue Feb 22 13:29:22 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

Found Known Changeset:
codeticket:  221947
included in: 222037
changeset:   16581:2fc7625fb0a1
parent:      16580:f1a10ca5e450
parent:      16579:6db9e915a3d7
user:        leyla_linden
date:        Wed Feb 23 16:38:45 2011 -0800
summary:     Merge

Found Known Changeset:
codeticket:  222033
included in: 222037
changeset:   16583:50eac09294be
user:        leyla_linden
date:        Thu Feb 24 15:02:55 2011 -0800
summary:     SH-1040 Make both model preview drop downs functional