summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorJiao Li <angela@lindenlab.com>2009-10-13 14:58:18 +0000
committerJiao Li <angela@lindenlab.com>2009-10-13 14:58:18 +0000
commit536a0aa13b1b055c8bb6ab9d0df8befd639058d5 (patch)
tree61726c67bbcbf530acc9a48f8e739851300b8680 /indra/newview/llfloatertools.cpp
parent57d02df2b7df49eb8962cc1d988ee15ca0e6d5d9 (diff)
media hud url component -- to be reviewed
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r--indra/newview/llfloatertools.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 320647ff1a..b64d8ab334 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1060,7 +1060,7 @@ void LLFloaterTools::getMediaState()
return;
}
- bool editable = (first_object->permModify());// && selectedMediaEditable());
+ bool editable = (first_object->permModify() || selectedMediaEditable());
// Media settings
U8 has_media = (U8)0;
@@ -1114,7 +1114,7 @@ void LLFloaterTools::getMediaState()
// Media data is valid
if(media_data_get!=default_media_data)
{
- //TODO: get Meida title
+ //TODO: get media title
//media_title = media_data_get->getTile();
//LLFloaterMediaSettings::getInstance()->mIdenticalValidMedia = true;
media_title = media_data_get.getHomeURL();
@@ -1149,7 +1149,7 @@ void LLFloaterTools::getMediaState()
// Media data is valid
if(media_data_get!=default_media_data)
{
- //TODO: get Meida title
+ //TODO: get media title
//media_title = media_data_get->getTile();
media_title = media_data_get.getHomeURL();
}