Ignored revisions: 12346
included in: 223339
changeset: 16702:dd0b0ce64884
tag: tip
parent: 16694:e1bdcc906e9f
parent: 16701:aed94e854443
user: Loren Shih
date: Thu Mar 10 13:32:22 2011 -0500
summary: Automated merge up from viewer-development into mesh-development
codeticket: 223245
codeticket: 223244
included in: 223339
changeset: 16701:aed94e854443
parent: 16678:73f42030a5c5
parent: 16700:bae554c60420
user: Merov Linden
date: Wed Mar 09 11:56:34 2011 -0800
summary: Crash hunters: pull in viewer-development
included in: 223245
included in: 223244
changeset: 16700:bae554c60420
user: Xiaohong Bao
date: Tue Mar 08 14:59:40 2011 -0700
summary: fix for STORM-1053: crash at LLTextureCache::writeToCache
included in: 223245
included in: 223244
changeset: 16699:0e8388ab102d
user: Xiaohong Bao
date: Tue Mar 08 14:20:14 2011 -0700
summary: fix for STORM-1052: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138
included in: 223245
included in: 223244
changeset: 16698:efc74a20699e
user: Xiaohong Bao
date: Tue Mar 08 11:52:28 2011 -0700
summary: fix for STORM-1049: [crashhunters] crash at LLViewerFetchedTexture::forceToSaveRawImage(int,bool)
included in: 223245
included in: 223244
changeset: 16697:ee8f44d82845
parent: 16663:012014899613
parent: 16696:e4c78fbe827f
user: Xiaohong Bao
date: Mon Mar 07 18:10:42 2011 -0700
summary: Automated merge with http://hg.secondlife.com/viewer-development
included in: 223245
included in: 223244
changeset: 16696:e4c78fbe827f
user: Xiaohong Bao
date: Mon Mar 07 18:10:28 2011 -0700
summary: fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion
included in: 223245
included in: 223244
changeset: 16695:781a5ad220e3
parent: 16597:767feb16f05f
user: Xiaohong Bao
date: Mon Mar 07 15:02:48 2011 -0700
summary: fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
Found Known Changeset:
codeticket: 222124
included in: 223245
included in: 223244
changeset: 16597:767feb16f05f
parent: 16595:26d968c2a973
parent: 16596:9889cdb29915
user: Merov Linden
date: Fri Feb 25 15:44:38 2011 -0800
summary: STORM-980 : pull into viewer-development
included in: 223245
included in: 223244
changeset: 16663:012014899613
parent: 16662:932a1a1fde58
parent: 16661:8b9f50878cc7
user: Dave SIMmONs
date: Mon Mar 07 16:39:38 2011 -0800
summary: Merge branches
included in: 223245
included in: 223244
changeset: 16661:8b9f50878cc7
parent: 16659:4a9773bbcfa5
parent: 16660:33cbcdbedf5f
user: Merov Linden
date: Mon Mar 07 14:31:09 2011 -0800
summary: STORM-1045 : pull into viewer-development
included in: 223245
included in: 223244
changeset: 16660:33cbcdbedf5f
parent: 16650:ef2df52563bb
user: Ardy Lay
date: Thu Feb 17 20:59:33 2011 -0600
summary: VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat history
Found Known Changeset:
codeticket: 222712
included in: 223245
included in: 223244
changeset: 16650:ef2df52563bb
parent: 16648:ce883982e738
parent: 16649:6fdd6dfddec4
user: Merov Linden
date: Thu Mar 03 23:25:03 2011 -0800
summary: STORM-969 : pull into viewer-development
included in: 223245
included in: 223244
changeset: 16659:4a9773bbcfa5
parent: 16657:51c4c2acdb66
parent: 16658:6127e75f7231
user: Merov Linden
date: Mon Mar 07 14:28:58 2011 -0800
summary: STORM-1037 : pull into viewer-development
included in: 223245
included in: 223244
changeset: 16658:6127e75f7231
parent: 16643:8596ccc522d9
user: Oz Linden
date: Thu Mar 03 14:22:37 2011 -0500
summary: storm-1037: remove the "hide url" checkboxes in parcel management
Found Known Changeset:
codeticket: 222612
included in: 223245
included in: 223244
changeset: 16643:8596ccc522d9
user: eli_linden
date: Wed Mar 02 17:29:47 2011 -0800
summary: VWR-24992 FIX remove evil old parameters in localized xml files
included in: 223245
included in: 223244
changeset: 16657:51c4c2acdb66
parent: 16653:342a36476403
parent: 16656:b514a892c873
user: Merov Linden
date: Mon Mar 07 14:24:57 2011 -0800
summary: STORM-236 : pull into viewer-development
included in: 223245
included in: 223244
changeset: 16656:b514a892c873
user: Vadim ProductEngine
date: Fri Mar 04 19:10:54 2011 +0200
summary: STORM-236 WIP Additional fixes.
included in: 223245
included in: 223244
changeset: 16655:88714ac94595
user: Vadim ProductEngine
date: Fri Mar 04 13:46:57 2011 +0200
summary: STORM-236 WIP Minor code improvements.
included in: 223245
included in: 223244
changeset: 16654:0aaf561c847a
parent: 16643:8596ccc522d9
user: Vadim ProductEngine
date: Thu Mar 03 20:49:42 2011 +0200
summary: STORM-236 FIXED Allow the "Speak" button to be removed, like other buttons.
Found Known Changeset:
codeticket: 222612
included in: 223245
included in: 223244
changeset: 16643:8596ccc522d9
user: eli_linden
date: Wed Mar 02 17:29:47 2011 -0800
summary: VWR-24992 FIX remove evil old parameters in localized xml files
included in: 223245
included in: 223244
changeset: 16653:342a36476403
parent: 16651:1e6115a8cc9d
parent: 16652:13afac48f0b7
user: Merov Linden
date: Mon Mar 07 14:13:51 2011 -0800
summary: STORM-28 : pull into viewer-development
included in: 223245
included in: 223244
changeset: 16652:13afac48f0b7
parent: 16643:8596ccc522d9
user: Seth ProductEngine
date: Tue Feb 22 18:46:00 2011 +0200
summary: STORM-28 FIXED Added the ability to send agent's own calling card to others.
Found Known Changeset:
codeticket: 222612
included in: 223245
included in: 223244
changeset: 16643:8596ccc522d9
user: eli_linden
date: Wed Mar 02 17:29:47 2011 -0800
summary: VWR-24992 FIX remove evil old parameters in localized xml files
included in: 223245
included in: 223244
changeset: 16651:1e6115a8cc9d
user: Merov Linden
date: Mon Mar 07 10:24:56 2011 -0800
summary: Update version number to 2.5.2
Found Known Changeset:
codeticket: 222712
included in: 223245
included in: 223244
changeset: 16650:ef2df52563bb
parent: 16648:ce883982e738
parent: 16649:6fdd6dfddec4
user: Merov Linden
date: Thu Mar 03 23:25:03 2011 -0800
summary: STORM-969 : pull into viewer-development
Found Known Changeset:
codeticket: 222867
included in: 223245
included in: 223244
changeset: 16662:932a1a1fde58
parent: 16650:ef2df52563bb
user: Dave SIMmONs
date: Mon Mar 07 15:01:04 2011 -0800
summary: ER-350: Viewer / sim camera positioning not working well on login. Viewer now sets the camera before calling send_agent_update(). Reviewed by Kelly.
Found Known Changeset:
codeticket: 223190
included in: 223245
included in: 223244
changeset: 16678:73f42030a5c5
user: Merov Linden
date: Tue Mar 08 17:00:39 2011 -0800
summary: STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error)
Found Known Changeset:
codeticket: 223315
included in: 223339
changeset: 16694:e1bdcc906e9f
parent: 16693:1655c1c75a4f
parent: 16691:e8ca3d30fffe
user: prep
date: Thu Mar 10 13:04:36 2011 -0500
summary: merge