Ignored revisions: 12346 included in: 222111 changeset: 14771:cd530256ffa1 tag: tip parent: 14751:efcdaf147828 parent: 14770:1bc100746447 user: Merov Lindendate: Thu Feb 24 12:02:39 2011 -0800 summary: Pull from viewer-development codeticket: 221902 included in: 222111 changeset: 14770:1bc100746447 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. codeticket: 221808 included in: 221902 changeset: 14769:00d6a54738ba parent: 14764:c10d5e37db1e parent: 14768: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: 14768: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: 14767: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: 14766:896cc2586527 parent: 14758:58fdb5218596 parent: 14765: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: 14765: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. Found Known Changeset: codeticket: 220710 included in: 221808 changeset: 14715:0ca239e469b3 parent: 14712:b0bceb572090 parent: 14714:1f7cc0608142 user: Xiaohong Bao date: Wed Feb 09 12:16:00 2011 -0700 summary: Automated merge with http://hg.secondlife.com/viewer-development codeticket: 221087 included in: 221808 changeset: 14758:58fdb5218596 user: Oz Linden date: Mon Feb 14 16:58:46 2011 -0500 summary: bump version number to 2.7.0 included in: 221087 changeset: 14757:ab7af4c63e33 user: Oz Linden date: Mon Feb 14 16:57:10 2011 -0500 summary: Added tag 2.6.0-start for changeset 92e58e51776a codeticket: 221037 included in: 221087 changeset: 14756:92e58e51776a tag: 2.6.0-start parent: 14753:c1f97b742cfb parent: 14755:a82bc930924a user: Merov Linden date: Fri Feb 11 17:42:37 2011 -0800 summary: STORM-975 : pull into viewer-development included in: 221037 changeset: 14755:a82bc930924a user: Jonathan Yap date: Mon Feb 07 11:55:17 2011 -0500 summary: STORM-975 forgot to update contributions.txt included in: 221037 changeset: 14754:0b6f5bd1055a parent: 14712:b0bceb572090 user: Jonathan Yap date: Sun Feb 06 18:26:47 2011 -0500 summary: STORM-975 Duplicated menu entry Develop/Ui/Region Debug Console Found Known Changeset: codeticket: 220434 included in: 221037 changeset: 14712:b0bceb572090 user: Merov Linden date: Fri Feb 04 16:38:26 2011 -0800 summary: STORM-610 : Backing out that change (test fail) included in: 221037 changeset: 14753:c1f97b742cfb parent: 14735:a2773f1fdfcf parent: 14752:396eb8fa4d71 user: Merov Linden date: Fri Feb 11 17:40:48 2011 -0800 summary: STORM-833 : pull into viewer-development included in: 221037 changeset: 14752:396eb8fa4d71 parent: 14715:0ca239e469b3 user: Seth ProductEngine date: Thu Feb 10 00:34:54 2011 +0200 summary: STORM-833 FIXED "i" button overlapping text in name list controls like Group Members list. Found Known Changeset: codeticket: 220710 included in: 221037 changeset: 14715:0ca239e469b3 parent: 14712:b0bceb572090 parent: 14714: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: 220951 included in: 221037 changeset: 14735:a2773f1fdfcf parent: 14734:e5176946eb04 parent: 14733:ec4ad7e3ecca user: Oz Linden date: Fri Feb 11 11:38:27 2011 -0500 summary: pull back release tag from viewer-beta codeticket: 221543 included in: 221808 changeset: 14764:c10d5e37db1e parent: 14763:aa3013a682c6 parent: 14760:379da6bd50a5 user: Oz Linden date: Thu Feb 17 15:09:50 2011 -0500 summary: merge changes for storm-937 codeticket: 221399 included in: 221543 changeset: 14760:379da6bd50a5 parent: 14750:d6736e2c4ba4 parent: 14759:2bf5c7f3c305 user: Oz Linden date: Wed Feb 16 15:52:05 2011 -0500 summary: merge changes for storm-981 included in: 221399 changeset: 14759:2bf5c7f3c305 user: Andrew Meadows date: Mon Feb 14 14:15:12 2011 -0800 summary: debug_console is now resizable included in: 221399 changeset: 14750:d6736e2c4ba4 parent: 14731:e3f87f72e083 user: Merov Linden date: Wed Feb 09 22:08:43 2011 -0800 summary: STORM-981 : Fix Linux link issues when LL_TESTS is ON Found Known Changeset: codeticket: 220801 included in: 221399 changeset: 14731:e3f87f72e083 parent: 14728:fa683e402285 parent: 14730:722eda82ef7d user: Merov Linden date: Wed Feb 09 20:18:26 2011 -0800 summary: STORM-986 : pull into viewer-development codeticket: 221029 included in: 221543 changeset: 14763:aa3013a682c6 user: Merov Linden date: Fri Feb 11 16:56:28 2011 -0800 summary: STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code included in: 221029 changeset: 14762:f283cd5b189b user: Merov Linden date: Wed Feb 09 15:23:07 2011 -0800 summary: STORM-937 : Fix python scripts shebang line and license header for consistency included in: 221029 changeset: 14761:978f149eb7cf parent: 14625:b542f8134a2b user: Merov Linden date: Fri Jan 28 16:00:57 2011 -0800 summary: STORM-937 : Makes all python paths use consistent syntax Found Known Changeset: codeticket: 219808 included in: 221029 changeset: 14625:b542f8134a2b parent: 14624:e5ed8fd3dc3d parent: 14615:47188cac296f user: Oz Linden date: Thu Jan 27 13:03:15 2011 -0500 summary: Automated merge with file:///Users/oz/Work/V-DR Found Known Changeset: codeticket: 221041 included in: 222111 changeset: 14751:efcdaf147828 parent: 14749:04adc988e3d3 parent: 14750:d6736e2c4ba4 user: Merov Linden date: Fri Feb 11 18:02:29 2011 -0800 summary: STORM-981 : pull for testing