From b8e5b091681a31730cdbd60c5619ff9975287a38 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 25 May 2011 20:23:54 -0700 Subject: Replaced the labels in the web browser window with icons based on those in the Open Icon Library (http://openiconlibrary.sourceforge.net) --- linden/indra/newview/llfloatermediabrowser.cpp | 9 ----- linden/indra/newview/llfloatermediabrowser.h | 1 - .../newview/skins/default/textures/textures.xml | 5 +++ .../default/xui/en-us/floater_media_browser.xml | 43 ++++++++++------------ linden/install.xml | 4 +- 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 @@ + + + + + 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"> - -