//-TT Satomi Ahn - Patch MU_OOC

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()

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";

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";

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)

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

indra/newview/llremoteparcelrequest.cpp

@@ -140,22 +140,25 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v
 	typedef std::vector<observer_multimap_t::iterator> 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);
 		}
 	}
 

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;

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;
 }
 
 

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();

indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml

@@ -357,36 +357,34 @@ Disabled for now.
      width="3"/>
 
     <layout_panel
-    mouse_opaque="false"
-    auto_resize="false"
-    follows="left|right"
-    height="28"
-    layout="topleft"
-    min_height="28"
-    min_width="40"
-    name="inventory_panel"
-    user_resize="false"
-    width="40">
-      <button
-           image_selected="PushButton_Selected_Press"
-           image_pressed="PushButton_Press"
-           image_pressed_selected="PushButton_Selected_Press"
-       follows="left|right"
-       height="23"
-       use_ellipses="true"
-       is_toggle="true"
-       image_overlay="inventory_18"
-       layout="topleft"
-       left="0"
-       tool_tip="Shows/hides Inventory"
-       top="5"
-       name="inventory_btn"
-       width="36">
-        <button.init_callback
-         function="Button.SetDockableFloaterToggle"
-         parameter="inventory" />
-      </button>
-    </layout_panel>
+         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">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="inventory_18"
+             layout="topleft"
+             left="0"
+             name="sidebar_inv_btn"
+             tool_tip="Shows/hides inventory"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>