From 522bcf17b759910040225c209f7851fbb0640c56 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 30 Nov 2010 20:52:30 -0800
Subject: SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be
 useful for viewer web apps

---
 .../skins/default/xui/en/floater_web_content.xml   | 124 +++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_web_content.xml

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
new file mode 100644
index 0000000000..777c67261a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="440"
+ layout="topleft"
+ min_height="140"
+ min_width="467"
+ name="floater_web_content"
+ help_topic="floater_web_content"
+ save_rect="true"
+ auto_tile="true"
+ title="WEB CONTENT"
+ width="820">
+    <floater.string
+     name="home_page_url">
+        http://www.secondlife.com
+    </floater.string>
+    <layout_stack
+     bottom="440"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="10"
+     name="stack1"
+     orientation="vertical" 
+     top="20"
+     width="800">
+        <layout_panel
+         auto_resize="false"
+         default_tab_group="1" 
+         height="20"
+         layout="topleft"
+         left="0"
+         min_height="20"
+         name="nav_controls"
+         top="400"
+         user_resize="false"
+         width="800">
+            <button
+             follows="left|top"
+             height="20"
+             label="Back"
+             layout="topleft"
+             left="0"
+             name="back"
+             top="0"
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Back" />
+			</button>
+            <button
+             follows="left|top"
+             height="20"
+             label="Forward"
+             layout="topleft"
+             left_pad="3"
+             name="forward"
+             top_delta="0"
+             width="68">
+				<button.commit_callback
+				function="MediaBrowser.Forward" />
+			</button>
+            <button
+             enabled="false"
+             follows="left|top"
+             height="20"
+             label="Reload"
+             layout="topleft"
+             left_pad="2"
+             name="reload"
+             top_delta="0"
+             width="70">
+				<button.commit_callback
+				function="MediaBrowser.Refresh" />
+			</button>
+            <combo_box
+             allow_text_entry="true"
+             follows="left|top|right"
+             tab_group="1"
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             max_chars="1024"
+             name="address"
+             combo_editor.select_on_focus="true"
+             top_delta="0"
+             width="540">
+				<combo_box.commit_callback
+				function="MediaBrowser.EnterAddress" />
+			</combo_box>
+            <button
+             enabled="false"
+             follows="right|top"
+             height="20"
+             label="Go"
+             layout="topleft"
+             left_pad="5"
+             name="go"
+             top_delta="0"
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Go" />
+			</button>
+        </layout_panel>
+    
+        <layout_panel
+         height="40"
+         layout="topleft"
+         left_delta="0"
+         name="external_controls"
+         top_delta="0"
+         user_resize="false"
+         width="540">
+          <web_browser
+             bottom="-30"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="webbrowser"
+             top="0"
+             width="540" />
+        </layout_panel>
+    </layout_stack>
+</floater>
-- 
cgit v1.2.3


From 88eabbd0776ed0c2ce923b23cda14b9f91445aa4 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 1 Dec 2010 19:02:53 -0800
Subject: SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be
 useful for viewer web apps Latest traunch of fixes to new Web only content
 floater Also removed line in test app that fails to build - have a note to
 fix later

---
 .../skins/default/xui/en/floater_web_content.xml   | 275 +++++++++++----------
 1 file changed, 151 insertions(+), 124 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 777c67261a..62df206360 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -1,124 +1,151 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="440"
- layout="topleft"
- min_height="140"
- min_width="467"
- name="floater_web_content"
- help_topic="floater_web_content"
- save_rect="true"
- auto_tile="true"
- title="WEB CONTENT"
- width="820">
-    <floater.string
-     name="home_page_url">
-        http://www.secondlife.com
-    </floater.string>
-    <layout_stack
-     bottom="440"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="10"
-     name="stack1"
-     orientation="vertical" 
-     top="20"
-     width="800">
-        <layout_panel
-         auto_resize="false"
-         default_tab_group="1" 
-         height="20"
-         layout="topleft"
-         left="0"
-         min_height="20"
-         name="nav_controls"
-         top="400"
-         user_resize="false"
-         width="800">
-            <button
-             follows="left|top"
-             height="20"
-             label="Back"
-             layout="topleft"
-             left="0"
-             name="back"
-             top="0"
-             width="55">
-				<button.commit_callback
-				function="MediaBrowser.Back" />
-			</button>
-            <button
-             follows="left|top"
-             height="20"
-             label="Forward"
-             layout="topleft"
-             left_pad="3"
-             name="forward"
-             top_delta="0"
-             width="68">
-				<button.commit_callback
-				function="MediaBrowser.Forward" />
-			</button>
-            <button
-             enabled="false"
-             follows="left|top"
-             height="20"
-             label="Reload"
-             layout="topleft"
-             left_pad="2"
-             name="reload"
-             top_delta="0"
-             width="70">
-				<button.commit_callback
-				function="MediaBrowser.Refresh" />
-			</button>
-            <combo_box
-             allow_text_entry="true"
-             follows="left|top|right"
-             tab_group="1"
-             height="20"
-             layout="topleft"
-             left_pad="5"
-             max_chars="1024"
-             name="address"
-             combo_editor.select_on_focus="true"
-             top_delta="0"
-             width="540">
-				<combo_box.commit_callback
-				function="MediaBrowser.EnterAddress" />
-			</combo_box>
-            <button
-             enabled="false"
-             follows="right|top"
-             height="20"
-             label="Go"
-             layout="topleft"
-             left_pad="5"
-             name="go"
-             top_delta="0"
-             width="55">
-				<button.commit_callback
-				function="MediaBrowser.Go" />
-			</button>
-        </layout_panel>
-    
-        <layout_panel
-         height="40"
-         layout="topleft"
-         left_delta="0"
-         name="external_controls"
-         top_delta="0"
-         user_resize="false"
-         width="540">
-          <web_browser
-             bottom="-30"
-             follows="all"
-             layout="topleft"
-             left="0"
-             name="webbrowser"
-             top="0"
-             width="540" />
-        </layout_panel>
-    </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="440"
+  layout="topleft"
+  min_height="140"
+  min_width="467"
+  name="floater_web_content"
+  help_topic="floater_web_content"
+  save_rect="true"
+  auto_tile="true"
+  title="WEB CONTENT"
+  width="820">
+  <layout_stack
+    bottom="440"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="810">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="20"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      user_resize="false"
+      width="800">
+      <button
+        follows="left|top"
+        height="20"
+        label="Back"
+        layout="topleft"
+        left="0"
+        name="back"
+        top="0"
+        width="35">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        follows="left|top"
+        height="20"
+        label="Forward"
+        layout="topleft"
+        left_pad="3"
+        name="forward"
+        top_delta="0"
+        width="35">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        enabled="false"
+        follows="left|top"
+        height="20"
+        label="Reload"
+        layout="topleft"
+        left_pad="2"
+        name="reload"
+        top_delta="0"
+        width="35">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <button
+        enabled="false"
+        follows="left|top"
+        height="20"
+        label="Stop"
+        layout="topleft"
+        left_pad="2"
+        name="stop"
+        top_delta="0"
+        width="35">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="20"
+        layout="topleft"
+        left_pad="5"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        top_delta="0"
+        width="610">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <button
+        enabled="false"
+        follows="right|top"
+        height="20"
+        label="Go"
+        layout="topleft"
+        left_pad="0"
+        name="go"
+        top_delta="0"
+        width="35">
+        <button.commit_callback
+          function="WebContent.Go" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      user_resize="false"
+      width="540">
+      <web_browser
+        bottom="-22"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="webbrowser"
+        top="0"
+        width="540" />
+      <text
+        type="string"
+        length="100"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        top_pad="5"
+        width="452"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1" 
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
-- 
cgit v1.2.3


From adb62e958ff3a4be2eb43fbb1754358ec60a118c Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 1 Dec 2010 22:25:13 -0800
Subject: SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be
 useful for viewer web apps Added support for graphic browser buttons and laid
 them out differently

---
 .../skins/default/xui/en/floater_web_content.xml   | 88 +++++++++++-----------
 1 file changed, 45 insertions(+), 43 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 62df206360..97a7a0e737 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -24,7 +24,7 @@
     <layout_panel
       auto_resize="false"
       default_tab_group="1"
-      height="20"
+      height="22"
       layout="topleft"
       left="0"
       min_height="20"
@@ -33,83 +33,86 @@
       user_resize="false"
       width="800">
       <button
+        image_overlay="Arrow_Left_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+		    hover_glow_amount="0.15"
         follows="left|top"
-        height="20"
-        label="Back"
+        height="22"
         layout="topleft"
-        left="0"
+        left="1"
         name="back"
         top="0"
-        width="35">
+        width="22">
         <button.commit_callback
           function="WebContent.Back" />
       </button>
       <button
+        image_overlay="Stop_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        enabled="false"
         follows="left|top"
-        height="20"
-        label="Forward"
+        height="22"
         layout="topleft"
-        left_pad="3"
-        name="forward"
+        left="27"
+        name="stop"
         top_delta="0"
-        width="35">
+        width="22">
         <button.commit_callback
-          function="WebContent.Forward" />
+          function="WebContent.Stop" />
       </button>
       <button
-        enabled="false"
+        image_overlay="Refresh_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         follows="left|top"
-        height="20"
-        label="Reload"
+        height="22"
         layout="topleft"
-        left_pad="2"
+        left="27"
         name="reload"
         top_delta="0"
-        width="35">
+        width="22">
         <button.commit_callback
           function="WebContent.Reload" />
-      </button>
+      </button>      
       <button
-        enabled="false"
+        image_overlay="Arrow_Right_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         follows="left|top"
-        height="20"
-        label="Stop"
+        height="22"
         layout="topleft"
-        left_pad="2"
-        name="stop"
+        left="51"
+        name="forward"
         top_delta="0"
-        width="35">
+        width="22">
         <button.commit_callback
-          function="WebContent.Stop" />
+          function="WebContent.Forward" />
       </button>
       <combo_box
         allow_text_entry="true"
         follows="left|top|right"
         tab_group="1"
-        height="20"
+        height="22"
         layout="topleft"
-        left_pad="5"
+        left_pad="4"
         max_chars="1024"
         name="address"
         combo_editor.select_on_focus="true"
         top_delta="0"
-        width="610">
+        width="729">
         <combo_box.commit_callback
           function="WebContent.EnterAddress" />
       </combo_box>
-      <button
-        enabled="false"
-        follows="right|top"
-        height="20"
-        label="Go"
-        layout="topleft"
-        left_pad="0"
-        name="go"
-        top_delta="0"
-        width="35">
-        <button.commit_callback
-          function="WebContent.Go" />
-      </button>
     </layout_panel>
     <layout_panel
       height="40"
@@ -125,8 +128,7 @@
         layout="topleft"
         left="0"
         name="webbrowser"
-        top="0"
-        width="540" />
+        top="0"/>
       <text
         type="string"
         length="100"
@@ -138,7 +140,7 @@
         top_pad="5"
         width="452"/>
       <progress_bar
-        color_bar="0.3 1.0 0.3 1" 
+        color_bar="0.3 1.0 0.3 1"
         follows="bottom|right"
         height="16"
         top_delta="-1"
-- 
cgit v1.2.3


From 6924998e85c5637c190c2c97bb94fa421cc6774e Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 3 Dec 2010 15:02:56 -0800
Subject: SOCIAL-333 FIX Order of buttons on Web content floater is wrong

---
 .../skins/default/xui/en/floater_web_content.xml   | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 97a7a0e737..d57cfe9cab 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -11,6 +11,7 @@
   save_rect="true"
   auto_tile="true"
   title="WEB CONTENT"
+  initial_mime_type="text/html"
   width="820">
   <layout_stack
     bottom="440"
@@ -50,40 +51,40 @@
           function="WebContent.Back" />
       </button>
       <button
-        image_overlay="Stop_Off"
+        image_overlay="Arrow_Right_Off"
 		    image_disabled="PushButton_Disabled"
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
-        enabled="false"
         follows="left|top"
         height="22"
         layout="topleft"
         left="27"
-        name="stop"
+        name="forward"
         top_delta="0"
         width="22">
         <button.commit_callback
-          function="WebContent.Stop" />
+          function="WebContent.Forward" />
       </button>
       <button
-        image_overlay="Refresh_Off"
+        image_overlay="Stop_Off"
 		    image_disabled="PushButton_Disabled"
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        enabled="false"
         follows="left|top"
         height="22"
         layout="topleft"
-        left="27"
-        name="reload"
+        left="51"
+        name="stop"
         top_delta="0"
         width="22">
         <button.commit_callback
-          function="WebContent.Reload" />
-      </button>      
+          function="WebContent.Stop" />
+      </button>
       <button
-        image_overlay="Arrow_Right_Off"
+        image_overlay="Refresh_Off"
 		    image_disabled="PushButton_Disabled"
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
@@ -92,11 +93,11 @@
         height="22"
         layout="topleft"
         left="51"
-        name="forward"
+        name="reload"
         top_delta="0"
         width="22">
         <button.commit_callback
-          function="WebContent.Forward" />
+          function="WebContent.Reload" />
       </button>
       <combo_box
         allow_text_entry="true"
-- 
cgit v1.2.3


From 9dd837f6bb7686213bd204131fb3368e63a55f5e Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 3 Dec 2010 15:35:23 -0800
Subject: SOCIAL-334 FIX Remove link color and action from status bar text in
 web content window

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index d57cfe9cab..eac1b4e712 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -138,6 +138,8 @@
         layout="topleft"
         left_delta="0"
         name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1" 
         top_pad="5"
         width="452"/>
       <progress_bar
-- 
cgit v1.2.3


From 61b675e0afb96d1d46b1f36a8d54bb8146ef27d6 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 8 Dec 2010 14:38:20 -0800
Subject: SOCIAL-358 FIX Add button to Web Content floater to open current URL
 in system browser

---
 .../skins/default/xui/en/floater_web_content.xml      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index eac1b4e712..3072ca1b0e 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -110,10 +110,27 @@
         name="address"
         combo_editor.select_on_focus="true"
         top_delta="0"
-        width="729">
+        width="702">
         <combo_box.commit_callback
           function="WebContent.EnterAddress" />
       </combo_box>
+      <button
+        image_overlay="ExternalBrowser_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        follows="right|top"
+        enabled="true" 
+        height="22"
+        layout="topleft"
+        name="popexternal"
+        right="800"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
     </layout_panel>
     <layout_panel
       height="40"
-- 
cgit v1.2.3


From 5dcf11ab4bf5903ff75513f037242cba1e3c11ca Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 14 Dec 2010 12:25:10 -0800
Subject: SOCIAL-373 FIX Media browser does not show https secure icon in
 address bar when a site is loaded over https

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 3072ca1b0e..46776d3f7e 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -114,6 +114,17 @@
         <combo_box.commit_callback
           function="WebContent.EnterAddress" />
       </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|right"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="656"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
       <button
         image_overlay="ExternalBrowser_Off"
 		    image_disabled="PushButton_Disabled"
@@ -126,7 +137,7 @@
         layout="topleft"
         name="popexternal"
         right="800"
-        top_delta="0"
+        top_delta="-2"
         width="22">
         <button.commit_callback
           function="WebContent.PopExternal" />
-- 
cgit v1.2.3


From c151e5d502ca1baa2083734df5086dbb0bf428fb Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 14 Dec 2010 15:02:05 -0800
Subject: SOCIAL-381 FIX WEB CONTENT shown in title bar of Web Content Browser
 when opening a popup window

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 46776d3f7e..61a2999c89 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -10,7 +10,7 @@
   help_topic="floater_web_content"
   save_rect="true"
   auto_tile="true"
-  title="WEB CONTENT"
+  title=""
   initial_mime_type="text/html"
   width="820">
   <layout_stack
-- 
cgit v1.2.3


From 4f19d06341617bf219fa9ab129f516424c394ad1 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 14 Dec 2010 15:12:54 -0800
Subject: SOCIAL-384 FIX Menu bar images do not have tooltips in Web Content
 Browser

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 61a2999c89..34462d7548 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -40,6 +40,7 @@
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
 		    hover_glow_amount="0.15"
+        tool_tip="Navigate back"
         follows="left|top"
         height="22"
         layout="topleft"
@@ -56,6 +57,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        tool_tip="Navigate forward"
         follows="left|top"
         height="22"
         layout="topleft"
@@ -72,6 +74,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        tool_tip="Stop navigation"
         enabled="false"
         follows="left|top"
         height="22"
@@ -89,6 +92,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        tool_tip="Reload page"
         follows="left|top"
         height="22"
         layout="topleft"
@@ -109,6 +113,7 @@
         max_chars="1024"
         name="address"
         combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
         top_delta="0"
         width="702">
         <combo_box.commit_callback
@@ -131,6 +136,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        tool_tip="Open current URL in your desktop browser"
         follows="right|top"
         enabled="true" 
         height="22"
-- 
cgit v1.2.3


From 179b434d89d91e849ebdbf1e73811389c7afe24a Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 15 Dec 2010 18:02:01 -0800
Subject: SOCIAL-389 FIX Stop button in Web Content panel does not stop page
 content from loading or progress bar So many things wrong here it wasn't
 funny - button not enabled, button not connected to function, wrong call to
 stop browser etc.

---
 indra/newview/skins/default/xui/en/floater_web_content.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 34462d7548..2ad46824c2 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -75,7 +75,7 @@
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
         tool_tip="Stop navigation"
-        enabled="false"
+        enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"
-- 
cgit v1.2.3