Ignored revisions: 12346 Ignoring 2403 ancestors included in old builds. included in: 221808 changeset: 14754:00d6a54738ba tag: tip parent: 14749:c10d5e37db1e parent: 14753:abe208938600 user: Xiaohong Baodate: Tue Feb 22 13:29:22 2011 -0700 summary: Automated merge with http://hg.secondlife.com/viewer-development included in: 221808 changeset: 14753: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: 14752: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: 14751:896cc2586527 parent: 14742:58fdb5218596 parent: 14750: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: 14750:12717ede9a5c parent: 14715: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. codeticket: 221543 included in: 221808 changeset: 14749:c10d5e37db1e parent: 14748:aa3013a682c6 parent: 14745:379da6bd50a5 user: Oz Linden date: Thu Feb 17 15:09:50 2011 -0500 summary: merge changes for storm-937