Ignored revisions: 12346
Ignoring 2366 ancestors included in old builds.
included in: 220710
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14715">14715:0ca239e469b3</a>
tag:         tip
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14712">14712:b0bceb572090</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14714">14714:1f7cc0608142</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Feb 09 12:16:00 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

included in: 220710
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14714">14714:1f7cc0608142</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Feb 09 12:15:21 2011 -0700
summary:     trivial: remove some redundant code.

included in: 220710
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14713">14713:6df4fc060e02</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14690">14690:763d54b1924f</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Feb 09 10:33:07 2011 -0700
summary:     debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight

codeticket:  220434
included in: 220710
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14712">14712:b0bceb572090</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Fri Feb 04 16:38:26 2011 -0800
summary:     STORM-610 : Backing out that change (test fail)

</pre></body></html>