Ignored revisions: 12346 Ignoring 2303 ancestors included in old builds. included in: 219991 changeset: 14655:fe7fe04ccc9a tag: tip parent: 14649:45a63ad4d737 parent: 14654:3aab4a54e6d9 user: Xiaohong Bao date: Fri Jan 28 21:23:35 2011 -0700 summary: Automated merge with http://hg.secondlife.com/viewer-development included in: 219991 changeset: 14654:3aab4a54e6d9 user: Xiaohong Bao date: Fri Jan 28 21:23:19 2011 -0700 summary: trivial: remove some debug code. included in: 219991 changeset: 14653:4de3178c6c81 user: Xiaohong Bao date: Fri Jan 28 17:19:42 2011 -0700 summary: fixed the major memory leaking for SH-723/SH-847: memoy leaking included in: 219991 changeset: 14652:c6bad5df2c9b user: Xiaohong Bao date: Fri Jan 28 17:01:18 2011 -0700 summary: trivial: convert to "unix return" included in: 219991 changeset: 14651:39b379b771f0 user: Xiaohong Bao date: Wed Jan 26 17:03:30 2011 -0700 summary: add "pause" function for SH-846: design and implement the debug code to locate memory leaking included in: 219991 changeset: 14650:c8c4058fe309 parent: 14610:26c09ad4293e user: Xiaohong Bao date: Wed Jan 26 11:13:04 2011 -0700 summary: for SH-846: design and implement the debug code to locate memory leaking codeticket: 219959 included in: 219991 changeset: 14649:45a63ad4d737 parent: 14648:1237987d1af9 parent: 14640:54109970bb3f user: Oz Linden date: Fri Jan 28 17:05:11 2011 -0500 summary: pull back fixes from beta