From d9eb8e27d57edc0857895fd0196f8f5a2c05130b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 30 Jan 2013 15:04:06 -0500 Subject: Added tag 3.4.5-beta4 for changeset 1567de5700c2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d220aa6855..0f7e0e90dc 100644 --- a/.hgtags +++ b/.hgtags @@ -412,3 +412,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 +1567de5700c273b583dac41b64275c223287306e 3.4.5-beta4 -- cgit v1.2.3 From 0908b60c1cfde9a7cfb131fb0690bd21f8943a57 Mon Sep 17 00:00:00 2001 From: Whirly Date: Fri, 1 Feb 2013 08:10:16 +0000 Subject: STORM-1930 Quality & Speed slider has Ultra label where High should be. --- doc/contributions.txt | 1 + .../skins/default/xui/en/panel_preferences_graphics1.xml | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 10d6818bd3..e86ef11a72 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1251,6 +1251,7 @@ Whimsy Winx Whirly Fizzle STORM-1895 MAINT-873 + STORM-1930 Whoops Babii VWR-631 VWR-1640 diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 7eb0fac2be..cd243d40a4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -147,11 +147,24 @@ height="12" layout="topleft" left_delta="87" - name="ShadersPrefText3" + name="ShadersPrefText2" top_delta="0" width="80"> Mid + + High + Date: Mon, 4 Feb 2013 12:23:33 -0600 Subject: MAINT-2323 Fix for crash on shutodwn in mesh responder destructors --- indra/newview/llmeshrepository.cpp | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 09003e3e53..1223615079 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -215,17 +215,19 @@ public: ~LLMeshHeaderResponder() { - if (!mProcessed && !LLApp::isQuitting()) - { //something went wrong, retry - llwarns << "Timeout or service unavailable, retrying." << llendl; - LLMeshRepository::sHTTPRetryCount++; - LLMeshRepoThread::HeaderRequest req(mMeshParams); - LLMutexLock lock(gMeshRepo.mThread->mMutex); - gMeshRepo.mThread->mHeaderReqQ.push(req); + if (!LLApp::isQuitting()) + { + if (!mProcessed) + { //something went wrong, retry + llwarns << "Timeout or service unavailable, retrying." << llendl; + LLMeshRepository::sHTTPRetryCount++; + LLMeshRepoThread::HeaderRequest req(mMeshParams); + LLMutexLock lock(gMeshRepo.mThread->mMutex); + gMeshRepo.mThread->mHeaderReqQ.push(req); + } + LLMeshRepoThread::decActiveHeaderRequests(); } - - LLMeshRepoThread::decActiveHeaderRequests(); } virtual void completedRaw(U32 status, const std::string& reason, @@ -252,13 +254,16 @@ public: ~LLMeshLODResponder() { - if (!mProcessed && !LLApp::isQuitting()) + if (!LLApp::isQuitting()) { - llwarns << "Killed without being processed, retrying." << llendl; - LLMeshRepository::sHTTPRetryCount++; - gMeshRepo.mThread->lockAndLoadMeshLOD(mMeshParams, mLOD); + if (!mProcessed) + { + llwarns << "Killed without being processed, retrying." << llendl; + LLMeshRepository::sHTTPRetryCount++; + gMeshRepo.mThread->lockAndLoadMeshLOD(mMeshParams, mLOD); + } + LLMeshRepoThread::decActiveLODRequests(); } - LLMeshRepoThread::decActiveLODRequests(); } virtual void completedRaw(U32 status, const std::string& reason, -- cgit v1.2.3 From 702332fc02a57d099dd4fb7465e778a017d666da Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Feb 2013 12:30:30 -0500 Subject: tag merge of DRTVWR-296 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d220aa6855..40a7a7e267 100644 --- a/.hgtags +++ b/.hgtags @@ -412,3 +412,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 +1cce8447f8f574673e3f47d6fe584262e6964fe2 DRTVWR-296 -- cgit v1.2.3 From d96c3220f8209312efdfa3d0ea0da4ad7d5c788d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Feb 2013 12:32:14 -0500 Subject: tag merge of DRTVWR-297 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d220aa6855..fa37d6a8a9 100644 --- a/.hgtags +++ b/.hgtags @@ -412,3 +412,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 +0a5d409161ef2a89b28c9a741051dd2dedc707d6 DRTVWR-297 -- cgit v1.2.3 From 79eeae502c4965a6091614f774aa68ba7837742a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Feb 2013 13:25:24 -0500 Subject: Added tag 3.4.5-beta5 for changeset 852b69ef0b5f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 710e7910db..0cbde9dd04 100644 --- a/.hgtags +++ b/.hgtags @@ -415,3 +415,4 @@ b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 1567de5700c273b583dac41b64275c223287306e 3.4.5-beta4 1cce8447f8f574673e3f47d6fe584262e6964fe2 DRTVWR-296 0a5d409161ef2a89b28c9a741051dd2dedc707d6 DRTVWR-297 +852b69ef0b5fe6b13b69cc2217282cc64de6afab 3.4.5-beta5 -- cgit v1.2.3 From e87000ba0750e55d9d6b55feccc4124f5d2b4b74 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 12 Feb 2013 07:06:24 -0500 Subject: Added tag 3.4.5-release for changeset a49c715243a3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0cbde9dd04..92ddad7884 100644 --- a/.hgtags +++ b/.hgtags @@ -416,3 +416,4 @@ b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 1cce8447f8f574673e3f47d6fe584262e6964fe2 DRTVWR-296 0a5d409161ef2a89b28c9a741051dd2dedc707d6 DRTVWR-297 852b69ef0b5fe6b13b69cc2217282cc64de6afab 3.4.5-beta5 +a49c715243a36a8a380504d14cb7416b3039c956 3.4.5-release -- cgit v1.2.3