Ignored revisions: 12346
included in: 221927
changeset:   16573:0ede9340f8b7
tag:         tip
user:        Loren Shih 
date:        Wed Feb 23 16:24:47 2011 -0500
summary:     Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.

included in: 221927
changeset:   16572:9ccae9518aa0
user:        Loren Shih 
date:        Wed Feb 23 13:22:51 2011 -0500
summary:     Fixes from merge of viewer-development -> mesh-development.

included in: 221927
changeset:   16571:ef46349c5349
parent:      16565:4980e58e9649
parent:      16570:00d6a54738ba
user:        Loren Shih 
date:        Wed Feb 23 12:50:17 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

codeticket:  221808
included in: 221927
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

included in: 221808
changeset:   16569:abe208938600
user:        Xiaohong Bao 
date:        Tue Feb 22 13:28:48 2011 -0700
summary:     set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking.

included in: 221808
changeset:   16568:69a559e0af9f
user:        Xiaohong Bao 
date:        Tue Feb 22 11:22:50 2011 -0700
summary:     more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.

included in: 221808
changeset:   16567:896cc2586527
parent:      16532:58fdb5218596
parent:      16566:12717ede9a5c
user:        Xiaohong Bao 
date:        Tue Feb 15 15:43:47 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

included in: 221808
changeset:   16566:12717ede9a5c
parent:      16478:0ca239e469b3
user:        Xiaohong Bao 
date:        Tue Feb 15 14:12:58 2011 -0700
summary:     partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking.

Found Known Changeset:
codeticket:  220710
included in: 221808
changeset:   16478:0ca239e469b3
parent:      16456:b0bceb572090
parent:      16477:1f7cc0608142
user:        Xiaohong Bao 
date:        Wed Feb 09 12:16:00 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

Found Known Changeset:
codeticket:  221087
included in: 221808
changeset:   16532:58fdb5218596
user:        Oz Linden 
date:        Mon Feb 14 16:58:46 2011 -0500
summary:     bump version number to 2.7.0

Found Known Changeset:
codeticket:  221543
included in: 221808
changeset:   16557:c10d5e37db1e
parent:      16556:aa3013a682c6
parent:      16544:379da6bd50a5
user:        Oz Linden 
date:        Thu Feb 17 15:09:50 2011 -0500
summary:     merge changes for storm-937

Found Known Changeset:
codeticket:  221843
included in: 221927
changeset:   16565:4980e58e9649
parent:      16563:4a4bfbb3918d
parent:      16564:45fa8d595618
user:        Dave Parks 
date:        Tue Feb 22 18:37:04 2011 -0600
summary:     merge