Replaced the labels in the web browser window with icons based on those in the Open Icon Library (http://openiconlibrary.sourceforge.net)

5 files changed, 27 insertions, 35 deletions

diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index a78c9d1..54ffc0f 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -119,7 +119,6 @@ BOOL LLFloaterMediaBrowser::postBuild()
         childSetAction("pause", onClickPlay, this);
         childSetAction("seek", onClickSeek, this);
         childSetAction("go", onClickGo, this);
-        childSetAction("close", onClickClose, this);
         childSetAction("open_browser", onClickOpenWebBrowser, this);
         childSetAction("assign", onClickAssign, this);
         childSetAction("home", onClickHome, this);
@@ -248,14 +247,6 @@ void LLFloaterMediaBrowser::onClickGo(void* user_data)
 }
 
 //static 
-void LLFloaterMediaBrowser::onClickClose(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->close();
-}
-
-//static 
 void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
 {
         LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
diff --git a/linden/indra/newview/llfloatermediabrowser.h b/linden/indra/newview/llfloatermediabrowser.h
index 7de1900..f2597f5 100644
--- a/linden/indra/newview/llfloatermediabrowser.h
+++ b/linden/indra/newview/llfloatermediabrowser.h
@@ -82,7 +82,6 @@ public:
         static void onClickBack(void* user_data);
         static void onClickForward(void* user_data);
         static void onClickGo(void* user_data);
-        static void onClickClose(void* user_data);
         static void onClickOpenWebBrowser(void* user_data);
         static void onClickAssign(void* user_data);
         static void onClickHome(void* user_data);
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 60fb4e0..9151ee9 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -397,5 +397,10 @@
   <texture name="media_btn_stoploading.png"/>
   <texture name="media_panel_divider.png"/>
   <texture name="media_panel_scrollbg.png"/>
+  
+  <texture name="go-previous-4.png"/>
+  <texture name="go-next-4.png"/>
+  <texture name="view-refresh-5.png"/> 
+  <texture name="go-home-4.png"/>
 
 </textures>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index c1bfdcc..76eee6f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -3,20 +3,20 @@
      height="440" min_height="140" min_width="467" name="floater_about"
      rect_control="FloaterMediaRect" title="Web Browser" width="560">
         <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
-                <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
+                <layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false"
                      width="800">
-                        <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
-                             width="55" />
-                        <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
-                             name="forward" width="68" />
-                        <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
-                             left_delta="70" name="reload" width="70" />
-                        <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="75" max_chars="255" name="address" width="485" />
-                        <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="487" name="go" width="55" />
-                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
-                             left_delta="58" name="home" width="55" />
+                        <button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back"
+                             width="25" />
+                        <button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27"
+                             name="forward" width="25" />
+                        <button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png" 
+                             left_delta="27" name="reload" width="25" />
+                        <combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20"
+                             left_delta="29" max_chars="255" name="address" width="622" />
+                        <button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif" 
+                             left_delta="625" name="go" width="55" />
+                        <button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
+                             left_delta="58" name="home" width="35" />
                 </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
                      width="800">
@@ -33,22 +33,19 @@
     </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
-                        <button bottom="0" enabled="false" follows="left|top" height="20"
-                             label="Send Current URL to Parcel" left="0" name="assign" width="200" />
+                        <button bottom="0" enabled="false" follows="left|top" height="22"
+                             label="Send Current URL To Parcel" left="0" name="assign" width="200" />
                 </layout_panel>
                 <layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
                      width="540">
                         <web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20"
                              width="540" />
-                        <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
+                        <button bottom="4" follows="bottom|left" height="22" label="Open In External Browser" font="SansSerif"
                              left="0" name="open_browser" width="185" />
-                        <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
-                             label="Always open in my web browser" left_delta="184" name="open_always"
-                             width="200" />
-                        <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set As Home"
-                             left="-176" name="set_home" width="104" />
-                        <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
-                             name="close" width="70" />
+                        <check_box bottom="6" control_name="UseExternalBrowser" follows="bottom|left" height="22"
+                             label="Always open in external browser" left_delta="190" name="open_always" width="200" />
+      <button bottom="4" enabled="false" follows="bottom|right" height="22" label="Set As Home" font="SansSerif"
+                             left="-110" name="set_home" width="104" />
                 </layout_panel>
         </layout_stack>
   <string name="home_page_url">
diff --git a/linden/install.xml b/linden/install.xml
index 90d0ae5..10226e9 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -179,9 +179,9 @@
           <key>common</key>
           <map>
             <key>md5sum</key>
-            <string>940f85fb8c629b7944688e812a089549</string>
+            <string>b587e60245ad4c40b13daa6d4021a63b</string>
             <key>url</key>
-            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110321.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110525.tar.bz2</uri>
           </map>
         </map>
       </map>