completed: Tue Feb 01 16:47:55 2011
. [ default ] . changeset: 14678:33fc9ed99d29 . tag: tip . parent: 14677:e94c02901c75 . parent: 14665:b575bde7d5e8 . user: Oz Linden <oz@lindenlab.com> . date: Tue Feb 01 07:22:32 2011 -0500 . summary: merge changes back from beta branch . changeset: 14677:e94c02901c75 . parent: 14676:f904ee733e5f . parent: 14675:603fb12649f3 . user: Kent Quirk <q@lindenlab.com> . date: Mon Jan 31 19:29:18 2011 -0500 . summary: Merge . . [ default ] . . changeset: 14675:603fb12649f3 . . parent: 14674:269fafd3fb88 . . parent: 14672:43f9b2d10aa3 . . user: Oz Linden <oz@lindenlab.com> . . date: Mon Jan 31 13:04:57 2011 -0500 . . summary: merge changes for storm-934 . . . [ default ] . . . changeset: 14672:43f9b2d10aa3 . . . parent: 14671:5dd42f6d8af6 . . . parent: 14648:1237987d1af9 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Mon Jan 31 12:46:58 2011 -0500 . . . summary: pull changes for STORM-940 and CHOP-369 . . . changeset: 14671:5dd42f6d8af6 . . . 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. . . . changeset: 14670:0a2ebeadc2f5 . . . 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. . . . changeset: 14669:04e9ada52f11 . . . parent: 14668:f45bf13b0c5f . . . parent: 14593:b1ba2bd8309f . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . date: Wed Jan 26 16:31:39 2011 -0800 . . . summary: merge from lindenlab/viewer-beta . . . changeset: 14668:f45bf13b0c5f . . . 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. . . . changeset: 14667:a531fa1abe74 . . . 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 . . . changeset: 14666:b2304fc8e9f6 . . . parent: 14563:54d772d8687c . . . 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. . . [ default ] . . changeset: 14674:269fafd3fb88 . . parent: 14673:9fb7940a8e61 . . parent: 14648:1237987d1af9 . . user: callum . . date: Fri Jan 28 15:59:19 2011 -0800 . . summary: Merge with head . . changeset: 14673:9fb7940a8e61 . . parent: 14647:8760544e7449 . . 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] . [ default ] . changeset: 14676:f904ee733e5f . parent: 14648:1237987d1af9 . user: Kent Quirk <q@lindenlab.com> . date: Mon Jan 31 19:18:58 2011 -0500 . summary: VWR-22024 -- apply Bao's patch to beta