From 29413e40024e881377a6b8a3f591e0118d6b5913 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Thu, 27 Jan 2011 15:19:00 -0600 Subject: [PATCH 1/7] Don't forget search results after teleporting. Fixes FIRE-341, from Kitty Barnett via WEB-1819. --- indra/newview/llfloatersearch.cpp | 12 ++++-------- indra/newview/llfloatersearch.h | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 3ed4aec89a..fc75708d28 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -103,14 +103,10 @@ BOOL LLFloaterSearch::postBuild() void LLFloaterSearch::onOpen(const LLSD& key) { - search(key); -} - -void LLFloaterSearch::onClose(bool app_quitting) -{ - // tear down the web view so we don't show the previous search - // result when the floater is opened next time - destroy(); + if ( (key.has("category")) || ((mBrowser) && (mBrowser->getCurrentNavUrl().empty())) ) + { + search(key); + } } void LLFloaterSearch::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h index ba4dc4c0fa..615c099d0d 100644 --- a/indra/newview/llfloatersearch.h +++ b/indra/newview/llfloatersearch.h @@ -53,8 +53,6 @@ public: /// see search() for details on the key parameter. /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ void onClose(bool app_quitting); - /// perform a search with the specific search term. /// The key should be a map that can contain the following keys: /// - "id": specifies the text phrase to search for From 9070e3140022b5e0c0deab08cdeb53385fc961fa Mon Sep 17 00:00:00 2001 From: Liny Date: Thu, 27 Jan 2011 13:55:07 -0800 Subject: [PATCH 2/7] Fixing the prim align tool to not crash on attempting to use. --- indra/newview/qtoolalign.cpp | 2 -- indra/newview/qtoolalign.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/indra/newview/qtoolalign.cpp b/indra/newview/qtoolalign.cpp index c8726bc989..dc01f3cb07 100644 --- a/indra/newview/qtoolalign.cpp +++ b/indra/newview/qtoolalign.cpp @@ -31,14 +31,12 @@ const F32 MANIPULATOR_SELECT_SIZE = 20.0; -QToolAlign* QToolAlign::sInstance = NULL; AlignThread* AlignThread::sInstance = NULL; void cmdline_printchat(std::string message); QToolAlign::QToolAlign() : LLTool(std::string("Align")) { - sInstance = this; } diff --git a/indra/newview/qtoolalign.h b/indra/newview/qtoolalign.h index 2b65fcb4f0..dfd513206b 100644 --- a/indra/newview/qtoolalign.h +++ b/indra/newview/qtoolalign.h @@ -39,7 +39,6 @@ public: static void pickCallback(const LLPickInfo& pick_info); static void aligndone(); - static QToolAlign* getInstance(){ return sInstance; } LLBBox mBBox; F32 mManipulatorSize; @@ -48,7 +47,6 @@ public: BOOL mForce; private: - static QToolAlign* sInstance; void align(); void computeManipulatorSize(); void renderManipulators(); From 9626b3d103bced2f40aad88b016e94ae536a7cb2 Mon Sep 17 00:00:00 2001 From: Liny Date: Thu, 27 Jan 2011 14:39:40 -0800 Subject: [PATCH 3/7] Fixing channel setting that became broken with moving the version to a cpp file. --- indra/llcommon/llversionviewer.cpp.in | 2 ++ indra/llcommon/llversionviewer.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llversionviewer.cpp.in b/indra/llcommon/llversionviewer.cpp.in index 93a87da1fc..bd82b1b13f 100644 --- a/indra/llcommon/llversionviewer.cpp.in +++ b/indra/llcommon/llversionviewer.cpp.in @@ -31,3 +31,5 @@ const S32 LL_VERSION_MAJOR = @VERSION_VIEWER_MAJOR@; const S32 LL_VERSION_MINOR = @VERSION_VIEWER_MINOR@; const S32 LL_VERSION_PATCH = @VERSION_VIEWER_PATCH@; const S32 LL_VERSION_BUILD = @VERSION_BUILD@; + +const char * const LL_CHANNEL = "Firestorm-private"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 53f6a02fb6..5338d4750b 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -32,7 +32,7 @@ LL_COMMON_API extern const S32 LL_VERSION_MINOR; LL_COMMON_API extern const S32 LL_VERSION_PATCH; LL_COMMON_API extern const S32 LL_VERSION_BUILD; -const char * const LL_CHANNEL = "Firestorm-private"; +LL_COMMON_API extern const char * const LL_CHANNEL; #if LL_DARWIN const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer"; From f96328b8e2507af76011394d3129760e7d33d045 Mon Sep 17 00:00:00 2001 From: Liny Date: Thu, 27 Jan 2011 14:47:15 -0800 Subject: [PATCH 4/7] Fixing build with the manifest mython script. --- indra/lib/python/indra/util/llmanifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 430e1e30dd..3153bf280b 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -90,7 +90,7 @@ def get_default_version(srctree): def get_channel(srctree): # look up llversionserver.h and parse out the version info - paths = [os.path.join(srctree, x, 'llversionviewer.h') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']] + paths = [os.path.join(srctree, x, 'llversionviewer.cpp') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']] for p in paths: if os.path.exists(p): contents = open(p, 'r').read() From 9eb82d4df0f905964f5888056015147e2b3d9de5 Mon Sep 17 00:00:00 2001 From: JessicaLyon Date: Thu, 27 Jan 2011 19:23:32 -0500 Subject: [PATCH 5/7] Fixed inventory button on bottom bar to open side bar inventory panel on grey w/sidetabs skin --- .../xui/en/panel_bottomtray.xml | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml index a744479188..5c881195fc 100644 --- a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml @@ -357,36 +357,34 @@ Disabled for now. width="3"/> - - + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="40" + mouse_opaque="false" + name="bottom_sbinv" + user_resize="false" + width="40"> + + + From 30e015258c8992bcab715c92e47d1f409fa0570e Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Thu, 27 Jan 2011 19:00:28 -0600 Subject: [PATCH 6/7] Fix crash bug in retrieving parcel data. From Kitty Barnett, via STORM-800. --- indra/newview/llremoteparcelrequest.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp index 0dff087553..e1fa60927f 100644 --- a/indra/newview/llremoteparcelrequest.cpp +++ b/indra/newview/llremoteparcelrequest.cpp @@ -140,22 +140,25 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v typedef std::vector deadlist_t; deadlist_t dead_iters; - observer_multimap_t::iterator oi; - observer_multimap_t::iterator start = observers.lower_bound(parcel_data.parcel_id); + observer_multimap_t::iterator oi = observers.lower_bound(parcel_data.parcel_id); observer_multimap_t::iterator end = observers.upper_bound(parcel_data.parcel_id); - for (oi = start; oi != end; ++oi) + while (oi != end) { - LLRemoteParcelInfoObserver * observer = oi->second.get(); + // increment the loop iterator now since it may become invalid below + observer_multimap_t::iterator cur_oi = oi++; + + LLRemoteParcelInfoObserver * observer = cur_oi->second.get(); if(observer) { + // may invalidate cur_oi if the observer removes itself observer->processParcelInfo(parcel_data); } else { // the handle points to an expired observer, so don't keep it // around anymore - dead_iters.push_back(oi); + dead_iters.push_back(cur_oi); } } From e7d7f78b6f17a240b07643afcc29eaab71e0182f Mon Sep 17 00:00:00 2001 From: Liny Date: Thu, 27 Jan 2011 17:00:42 -0800 Subject: [PATCH 7/7] Fixing the ability to hide bottom bar buttons if login progress screens are disabled. --- indra/newview/llstartup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ee9edcc1d2..4ea218ae8a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2141,7 +2141,7 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response) void set_startup_status(const F32 frac, const std::string& string, const std::string& msg) { - if(gSavedSettings.getBOOL("PhoenixDisableLoginScreens")) + if(gSavedSettings.getBOOL("PhoenixDisableLoginScreens") && LLStartUp::getStartupState() > STATE_BROWSER_INIT) { static std::string last_d; std::string new_d = string;