summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmedia.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2009-10-27 11:19:03 -0700
committerrichard <none@none>2009-10-27 11:19:03 -0700
commitafb9df7643443f62a154f93c0f3eb39dfc218a48 (patch)
tree7c3a1c3eaccb33af933d0d642030160a7c513b36 /indra/llplugin/llpluginclassmedia.cpp
parentb4dd4a4d7777dccd8a5503c5e5736b57710cbfa7 (diff)
parentd4c3bf46ed6718ed1fa219d56436548edc6a2fa7 (diff)
merge
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 6556aa33a4..26802bbd1c 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1129,6 +1129,11 @@ void LLPluginClassMedia::setVolume(float volume)
}
}
+float LLPluginClassMedia::getVolume()
+{
+ return mRequestedVolume;
+}
+
void LLPluginClassMedia::initializeUrlHistory(const LLSD& url_history)
{
// Send URL history to plugin