diff --git a/indra/newview/llfloatermediabrowser.cpp b/indra/newview/llfloatermediabrowser.cpp index d73cfde72..43abcb8c0 100644 --- a/indra/newview/llfloatermediabrowser.cpp +++ b/indra/newview/llfloatermediabrowser.cpp @@ -105,6 +105,7 @@ void LLFloaterMediaBrowser::draw() media_playing = media_plugin->getStatus() == LLPluginClassMediaOwner::MEDIA_PLAYING; } } + childSetVisible("time_controls", show_time_controls); childSetVisible("rewind", show_time_controls); childSetVisible("play", show_time_controls && ! media_playing); childSetVisible("pause", show_time_controls && media_playing); @@ -139,7 +140,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); @@ -284,14 +284,6 @@ void LLFloaterMediaBrowser::onClickGo(void* user_data) self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString()); } -//static -void LLFloaterMediaBrowser::onClickClose(void* user_data) -{ - LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data; - - self->close(); -} - //static void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data) { diff --git a/indra/newview/llfloatermediabrowser.h b/indra/newview/llfloatermediabrowser.h index afdd6e733..c2203670a 100644 --- a/indra/newview/llfloatermediabrowser.h +++ b/indra/newview/llfloatermediabrowser.h @@ -85,7 +85,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 onClickRewind(void* user_data); diff --git a/indra/newview/skins/default/textures/go-home-4.png b/indra/newview/skins/default/textures/go-home-4.png new file mode 100644 index 000000000..058c00af4 Binary files /dev/null and b/indra/newview/skins/default/textures/go-home-4.png differ diff --git a/indra/newview/skins/default/textures/go-next-4.png b/indra/newview/skins/default/textures/go-next-4.png new file mode 100644 index 000000000..b4362c1ed Binary files /dev/null and b/indra/newview/skins/default/textures/go-next-4.png differ diff --git a/indra/newview/skins/default/textures/go-previous-4.png b/indra/newview/skins/default/textures/go-previous-4.png new file mode 100644 index 000000000..d5a677ecd Binary files /dev/null and b/indra/newview/skins/default/textures/go-previous-4.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 3f93a7ef8..c7929b058 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -390,5 +390,10 @@ + + + + + diff --git a/indra/newview/skins/default/textures/view-refresh-5.png b/indra/newview/skins/default/textures/view-refresh-5.png new file mode 100644 index 000000000..cb5d1b97c Binary files /dev/null and b/indra/newview/skins/default/textures/view-refresh-5.png differ diff --git a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml index 3028dc7ae..ec1aa623a 100644 --- a/indra/newview/skins/default/xui/en-us/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en-us/floater_media_browser.xml @@ -3,18 +3,20 @@ height="440" min_height="140" min_width="467" name="floater_about" rect_control="FloaterMediaRect" title="Media Browser" width="820"> - -