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() 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"; 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 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); } } 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; 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(); 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"> + + +