From 52d80701bbf38921e68f0df8d989cc9f31867a41 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Mon, 1 Feb 2010 18:11:02 +0000
Subject: EXT-4813: Added a "Loading..." indicator to the Help Browser.

This appears at the bottom of the Help Browser floater while a page is
loading. I also cleaned up the XUI file a little and removed some
unused strings.
---
 indra/newview/llfloaterhelpbrowser.cpp             | 19 ++++++++++----
 .../skins/default/xui/en/floater_help_browser.xml  | 29 ++++++++++++++--------
 2 files changed, 32 insertions(+), 16 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp
index 2e0ae3265e..f3c6b286ab 100644
--- a/indra/newview/llfloaterhelpbrowser.cpp
+++ b/indra/newview/llfloaterhelpbrowser.cpp
@@ -85,13 +85,22 @@ void LLFloaterHelpBrowser::onClose(bool app_quitting)
 
 void LLFloaterHelpBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
-	if(event == MEDIA_EVENT_LOCATION_CHANGED)
+	switch (event) 
 	{
+	case MEDIA_EVENT_LOCATION_CHANGED:
 		setCurrentURL(self->getLocation());
-	}
-	else if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
-	{
-		// nothing yet
+		break;
+
+	case MEDIA_EVENT_NAVIGATE_BEGIN:
+		childSetText("status_text", getString("loading_text"));
+		break;
+		
+	case MEDIA_EVENT_NAVIGATE_COMPLETE:
+		childSetText("status_text", getString("done_text"));
+		break;
+
+	default:
+		break;
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index e83bc1555c..be32e917e5 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -4,8 +4,8 @@
  can_resize="true"
  height="480"
  layout="topleft"
- min_height="140"
- min_width="467"
+ min_height="150"
+ min_width="500"
  name="floater_help_browser"
  help_topic="floater_help_browser"
  save_rect="true"
@@ -13,37 +13,44 @@
  title="HELP BROWSER"
  width="620">
     <floater.string
-     name="home_page_url">
-        http://www.secondlife.com
+     name="loading_text">
+        Loading...
     </floater.string>
     <floater.string
-     name="support_page_url">
-        http://support.secondlife.com
+     name="done_text">
     </floater.string>
     <layout_stack
      bottom="480"
      follows="left|right|top|bottom"
      layout="topleft"
-     left="10"
+     left="5"
      name="stack1"
      top="20"
-     width="600">
+     width="610">
         <layout_panel
-         height="1"
          layout="topleft"
          left_delta="0"
-         name="external_controls"
          top_delta="0"
+         name="external_controls"
          user_resize="false"
          width="590">
             <web_browser
-             bottom="-4"
+             bottom="-11"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
              name="browser"
              top="0"
+             height="500"
              width="590" />
+            <text
+             follows="bottom|left"
+             height="16"
+             layout="topleft"
+             left_delta="2"
+             name="status_text"
+             top_pad="5"
+             width="150" />
         </layout_panel>
     </layout_stack>
 </floater>
-- 
cgit v1.2.3


From f0ee8af8ae832fc01aa5c79898efc72b822e40af Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 1 Feb 2010 13:46:22 -0500
Subject: EXT-4816 : Fix coverty whine on break statement fallthrough

Can't fix the whine, but added a comment that the fallthrough is deliberate.
---
 indra/newview/llinventorybridge.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index e04d3ec5a0..e8a4899a0b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4634,6 +4634,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			{
 				case LLAssetType::AT_CLOTHING:
 					items.push_back(std::string("Take Off"));
+					// Fallthrough since clothing and bodypart share wear options
 				case LLAssetType::AT_BODYPART:
 					if (get_is_item_worn(item->getUUID()))
 					{
-- 
cgit v1.2.3