From 1b51c5850f0217ded59870dee7a28fa77591e6cd Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Thu, 1 Sep 2011 15:15:26 -0400 Subject: Removed tag DRTVWR-78_3.0.0-release --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 7bf2b04e17..eefd56ed78 100644 --- a/.hgtags +++ b/.hgtags @@ -181,3 +181,5 @@ f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start 1778f26b6d0ae762dec3ca37140f66620f2485d9 3.0.0-release 42784bf50fa01974bada2a1af3892ee09c93fcda DRTVWR-83_3.0.2-beta1 42784bf50fa01974bada2a1af3892ee09c93fcda 3.0.2-beta1 +1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release +0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release -- cgit v1.2.3 From 1b9a39a2e1050bb1366cce5f1140a1608633c473 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Thu, 1 Sep 2011 15:16:32 -0400 Subject: Added tag DRTVWR-77_3.0.0-release for changeset 1778f26b6d0a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index eefd56ed78..c25727650b 100644 --- a/.hgtags +++ b/.hgtags @@ -183,3 +183,4 @@ f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start 42784bf50fa01974bada2a1af3892ee09c93fcda 3.0.2-beta1 1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release 0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release +1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-77_3.0.0-release -- cgit v1.2.3 From 8ed52654d05d981dd8a5d63b7cb5445bdcabb271 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 13 Sep 2011 03:47:27 +0300 Subject: STORM-1585 FIXED Duplicated/missing XUI IDs in floater_preferences_proxy.xml. --- .../newview/skins/default/xui/en/floater_preferences_proxy.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml index 449731ab89..93bfe53aae 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml @@ -29,7 +29,7 @@ height="10" left_delta="23" layout="topleft" - name="Proxy location" + name="http_proxy_label" top_pad="10" width="300"> HTTP Proxy: @@ -81,7 +81,7 @@ height="10" layout="topleft" left_delta="23" - name="Proxy location" + name="socks5_proxy_label" top_pad="10" width="300"> SOCKS 5 Proxy: @@ -125,7 +125,7 @@ height="10" layout="topleft" left="40" - name="Proxy location" + name="socks_auth_label" top_pad="15" width="300"> SOCKS Authentication: @@ -163,6 +163,7 @@ height="10" layout="topleft" left_delta="20" + name="socks5_username_label" top_delta="50" width="200"> Username: @@ -174,6 +175,7 @@ height="10" left_pad="15" layout="topleft" + name="socks5_password_label" width="200"> Password: @@ -207,7 +209,7 @@ height="10" layout="topleft" left="25" - name="Proxy location" + name="other_proxy_label" top_pad="18" width="300"> Other HTTP traffic proxy: -- cgit v1.2.3 From a21aa5509d1c1069a3562b7339f4d22ae927110d Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 13 Sep 2011 16:59:30 +0300 Subject: STORM-1595 FIXED Removing a wrong debug assertion. --- indra/newview/llsidetray.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index a7c4057846..93ea952533 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -685,7 +685,6 @@ LLSideTrayTab* LLSideTray::getTab(const std::string& name) bool LLSideTray::isTabAttached(const std::string& name) { LLSideTrayTab* tab = getTab(name); - llassert(tab); if (!tab) return false; return std::find(mTabs.begin(), mTabs.end(), tab) != mTabs.end(); -- cgit v1.2.3 From 2c03ee82ecee87c61546be86b28cff2252fd643a Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 13 Sep 2011 18:41:15 +0300 Subject: STORM-1599 FIXED Scrolling search history with mouse wheel now doesn't zoom the wold view upon reaching the end of list. --- indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 9749b6fdd4..51ffec4727 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -146,7 +146,8 @@ border.highlight_light_color="FocusColor" border.highlight_dark_color="FocusColor" border.shadow_light_color="FocusColor" - border.shadow_dark_color="FocusColor"/> + border.shadow_dark_color="FocusColor" + mouse_wheel_opaque="true" /> Date: Tue, 13 Sep 2011 12:45:28 -0500 Subject: STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously. --- indra/llcommon/llthread.h | 3 ++- indra/llmessage/llcurl.cpp | 6 +++++- indra/llmessage/llcurl.h | 1 + indra/newview/app_settings/settings.xml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index c732e3bc77..b631b96252 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -195,7 +195,8 @@ public: } ~LLMutex() { - llassert(!isLocked()); // better not be locked! + //this assertion erroneously triggers whenever an LLCondition is destroyed + //llassert(!isLocked()); // better not be locked! apr_thread_mutex_destroy(mAPRMutexp); mAPRMutexp = NULL; } diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 14e169c6b1..280a8942a8 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -222,7 +222,7 @@ namespace boost std::set LLCurl::Easy::sFreeHandles; std::set LLCurl::Easy::sActiveHandles; LLMutex* LLCurl::Easy::sHandleMutex = NULL; - +LLMutex* LLCurl::Easy::sMultiMutex = NULL; //static CURL* LLCurl::Easy::allocEasyHandle() @@ -606,6 +606,7 @@ void LLCurl::Multi::run() mPerformState = PERFORM_STATE_PERFORMING; if (!mQuitting) { + LLMutexLock lock(LLCurl::Easy::sMultiMutex); doPerform(); } } @@ -1179,6 +1180,7 @@ void LLCurl::initClass(bool multi_threaded) check_curl_code(code); Easy::sHandleMutex = new LLMutex(); + Easy::sMultiMutex = new LLMutex(); #if SAFE_SSL S32 mutex_count = CRYPTO_num_locks(); @@ -1200,6 +1202,8 @@ void LLCurl::cleanupClass() delete Easy::sHandleMutex; Easy::sHandleMutex = NULL; + delete Easy::sMultiMutex; + Easy::sMultiMutex = NULL; for (std::set::iterator iter = Easy::sFreeHandles.begin(); iter != Easy::sFreeHandles.end(); ++iter) { diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index 213b281e72..a876a1562e 100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -251,6 +251,7 @@ private: static std::set sFreeHandles; static std::set sActiveHandles; static LLMutex* sHandleMutex; + static LLMutex* sMultiMutex; }; class LLCurl::Multi : public LLThread diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6ebb0162a4..27598c9aac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1858,7 +1858,7 @@ Type Boolean Value - 0 + 1 Cursor3D -- cgit v1.2.3 From 19371a9abed3198f9f6083c3b2483e65778e944a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 13 Sep 2011 13:09:10 -0500 Subject: STORM-1562 Potential fix for crash in LLCurl::run -- make sure all ref counted members of llsecapi are thread safe --- indra/newview/llsecapi.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h index 0935a0005b..db57848320 100644 --- a/indra/newview/llsecapi.h +++ b/indra/newview/llsecapi.h @@ -132,7 +132,7 @@ protected: // LLCertificates are considered unmodifiable // Certificates are pulled out of stores, or created via // factory calls -class LLCertificate : public LLRefCount +class LLCertificate : public LLThreadSafeRefCount { LOG_CLASS(LLCertificate); public: @@ -170,7 +170,7 @@ public: // base iterator implementation class, providing // the functionality needed for the iterator class. - class iterator_impl : public LLRefCount + class iterator_impl : public LLThreadSafeRefCount { public: iterator_impl() {}; @@ -289,7 +289,7 @@ bool operator!=(const LLCertificateVector::iterator& _lhs, const LLCertificateVe // * Persistence of credential information based on grid (for saving username/password) // * Serialization to an OGP identifier/authenticator pair // -class LLCredential : public LLRefCount +class LLCredential : public LLThreadSafeRefCount { public: @@ -424,7 +424,7 @@ protected: // LLSecAPIHandler Class // Interface handler class for the various security storage handlers. -class LLSecAPIHandler : public LLRefCount +class LLSecAPIHandler : public LLThreadSafeRefCount { public: -- cgit v1.2.3 From 758b936deaa0e6ea397c49afa5024315415eeb93 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 14 Sep 2011 13:24:31 -0400 Subject: Trying to fix Mac build issue --- indra/llmessage/llcurl.h | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 indra/llmessage/llcurl.h diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h old mode 100644 new mode 100755 index a876a1562e..87de202717 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -232,6 +232,7 @@ public: private: friend class LLCurl; + friend class LLCurl::Multi; CURL* mCurlEasyHandle; struct curl_slist* mHeaders; -- cgit v1.2.3 From 671a76b40c0669cb8d4b08a6617ec33c47324a49 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Thu, 15 Sep 2011 14:30:19 -0400 Subject: Added tag DRTVWR-89_3.0.3-beta2, 3.0.3-beta2 for changeset 61aa7974df08 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index a5c2186e02..07b6046c3c 100644 --- a/.hgtags +++ b/.hgtags @@ -186,3 +186,5 @@ e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e 3.0.2-beta2 b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 DRTVWR-85_3.0.3-beta1 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 3.0.3-beta1 +61aa7974df089e8621fe9a4c69bcdefdb3cc208a DRTVWR-89_3.0.3-beta2 +61aa7974df089e8621fe9a4c69bcdefdb3cc208a 3.0.3-beta2 -- cgit v1.2.3