merging

5 files changed, 19 insertions, 11 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 8f9be5285d..d2aae11191 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -655,7 +655,7 @@ void LLFloater::openFloater(const LLSD& key)
 {
 	llinfos << "Opening floater " << getName() << llendl;
 	mKey = key; // in case we need to open ourselves again
-	
+
 	if (getSoundFlags() != SILENT 
 	// don't play open sound for hosted (tabbed) windows
 		&& !getHost() 
@@ -2394,6 +2394,11 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus)
 {
 	if (mFrontChild == child)
 	{
+
+		if (give_focus && !gFocusMgr.childHasKeyboardFocus(child))
+		{
+			child->setFocus(TRUE);
+		}
 		return;
 	}
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 126df69519..fd4d1df894 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10215,7 +10215,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>2</integer>
+      <integer>0</integer>
     </map>
     <key>CallLogSortOrder</key>
     <map>
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index ff171fc0f8..d0a8dfc0c8 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2620,8 +2620,9 @@ void LLIMMgr::addMessage(
 	if (is_offline_msg)
     {
         LLFloaterReg::showInstance("im_container");
+	    LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->
+	    		flashConversationItemWidget(session_id, true);
     }
-
 }
 
 void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args)
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index df1ccdd9fc..115114bb53 100644
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -89,6 +89,9 @@ BOOL LLPanelBlockedList::postBuild()
 	case E_SORT_BY_TYPE:
 		mBlockedList->sortByType();
 		break;
+	default:
+		llwarns << "Unrecognized sort order for blocked list" << llendl;
+		break;
 	}
 
 	// Use the context menu of the Block list for the Block tab gear menu.
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index d494d12903..268b68b539 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -356,9 +356,8 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
     if(rect != LLRect::null)
     {
         this->setShape(rect);
-    }		 
+    }
     mInfoPanel = getChild<LLPanel>("info_panel");
-    mInfoPanel->setFollowsAll();
 
     mControlPanel = getChild<LLPanel>("control_panel");
     BUTTON_WIDTH = gSavedSettings.getS32("ToastButtonWidth");
@@ -453,10 +452,10 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
             if(h_pad < 2*HPAD)
             {
                 /*
-                * Probably it is a scriptdialog toast
-                * for a scriptdialog toast h_pad can be < 2*HPAD if we have a lot of buttons.
-                * In last case set default h_pad to avoid heaping of buttons 
-                */
+                 * Probably it is a scriptdialog toast
+                 * for a scriptdialog toast h_pad can be < 2*HPAD if we have a lot of buttons.
+                 * In last case set default h_pad to avoid heaping of buttons 
+                 */
                 S32 button_per_row = button_panel_width / BUTTON_WIDTH;
                 h_pad = (button_panel_width % BUTTON_WIDTH) / (button_per_row - 1);// -1  because we do not need space after last button in a row   
                 if(h_pad < 2*HPAD) // still not enough space between buttons ?
@@ -491,10 +490,10 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
             //mButtons.assign(buttons.begin(), buttons.end());
         }
     }
+
     // adjust panel's height to the text size
+    mInfoPanel->setFollowsAll();
     snapToMessageHeight(mTextBox, MAX_LENGTH);
-
-
 }