Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spit shine on browser, good as new! Thanks McCabe!

Browse Source
This commit is contained in:
Siana Gearz
2011-10-15 03:10:31 +02:00
parent 61777e9b8c
commit ca757ff1b2
8 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloatermediabrowser.cpp
View File

@@ -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)
{