Ignored revisions: 12346
Ignoring 2319 ancestors included in old builds.
included in: 220115
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14678">14678:33fc9ed99d29</a>
tag:         tip
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14677">14677:e94c02901c75</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14665">14665:b575bde7d5e8</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Tue Feb 01 07:22:32 2011 -0500
summary:     merge changes back from beta branch

codeticket:  220029
included in: 220115
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14665">14665:b575bde7d5e8</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14664">14664:b5c3758a8079</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14663">14663:127f6fc35c12</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:34:17 2011 -0500
summary:     merge changes for storm-845

codeticket:  220094
included in: 220115
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14677">14677:e94c02901c75</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14676">14676:f904ee733e5f</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14675">14675:603fb12649f3</a>
user:        Kent Quirk <q@lindenlab.com>
date:        Mon Jan 31 19:29:18 2011 -0500
summary:     Merge

codeticket:  220033
included in: 220094
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14675">14675:603fb12649f3</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14674">14674:269fafd3fb88</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14672">14672:43f9b2d10aa3</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 13:04:57 2011 -0500
summary:     merge changes for storm-934

included in: 220033
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14672">14672:43f9b2d10aa3</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14671">14671:5dd42f6d8af6</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14648">14648:1237987d1af9</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:46:58 2011 -0500
summary:     pull changes for STORM-940 and CHOP-369

codeticket:  219828
included in: 220033
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14671">14671:5dd42f6d8af6</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Thu Jan 27 11:37:59 2011 -0800
summary:     STORM-940: use the tip, not the dialog.

included in: 219828
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14670">14670:0a2ebeadc2f5</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Thu Jan 27 11:37:00 2011 -0800
summary:     more for storm 940: treat the manditory download after login like an optional one.

included in: 219828
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14669">14669:04e9ada52f11</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14668">14668:f45bf13b0c5f</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14593">14593:b1ba2bd8309f</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Wed Jan 26 16:31:39 2011 -0800
summary:     merge from lindenlab/viewer-beta

included in: 219828
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14668">14668:f45bf13b0c5f</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Wed Jan 26 16:31:15 2011 -0800
summary:     fix for STORM-940: don't show manditory update dialog if already logged in.

codeticket:  219560
included in: 219828
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14667">14667:a531fa1abe74</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Mon Jan 24 14:58:10 2011 -0800
summary:     a less brain dead fix for CHOP-369

codeticket:  219496
included in: 219560
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14666">14666:b2304fc8e9f6</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14563">14563:54d772d8687c</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Mon Jan 24 10:54:08 2011 -0800
summary:     fix CHOP-369: catch case of synchronous download failure.

included in: 220033
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14674">14674:269fafd3fb88</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14673">14673:9fb7940a8e61</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14648">14648:1237987d1af9</a>
user:        callum
date:        Fri Jan 28 15:59:19 2011 -0800
summary:     Merge with head

included in: 220033
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14673">14673:9fb7940a8e61</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14647">14647:8760544e7449</a>
user:        callum
date:        Fri Jan 28 15:57:42 2011 -0800
summary:     STORM-934 POSSIBLE FIX [crashhunters] crash at [2] LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp]

included in: 220094
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14676">14676:f904ee733e5f</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14648">14648:1237987d1af9</a>
user:        Kent Quirk <q@lindenlab.com>
date:        Mon Jan 31 19:18:58 2011 -0500
summary:     VWR-22024 -- apply Bao's patch to beta

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