Ignored revisions: 12346
Ignoring 2336 ancestors included in old builds.
included in: 220170
changeset: 14685:ebd53632620a
tag: tip
parent: 14682:0ebf060ac6c3
parent: 14684:b047db67c337
user: Xiaohong Bao
date: Tue Feb 01 17:55:33 2011 -0700
summary: Automated merge with http://hg.secondlife.com/viewer-development
included in: 220170
changeset: 14684:b047db67c337
user: Xiaohong Bao
date: Tue Feb 01 17:53:25 2011 -0700
summary: fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially)
included in: 220170
changeset: 14683:832d5b99459b
parent: 14655:fe7fe04ccc9a
user: Xiaohong Bao
date: Tue Feb 01 16:01:44 2011 -0700
summary: fix for SH-891: crash at LLDrawable::getFace(int)
codeticket: 220134
included in: 220170
changeset: 14682:0ebf060ac6c3
parent: 14678:33fc9ed99d29
parent: 14681:1e7bc2d6751a
user: Dave Parks
date: Tue Feb 01 15:35:56 2011 -0600
summary: merge