diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llfloatertools.h | 1 |
2 files changed, 3 insertions, 4 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(); } diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h index ffccf93943..59acef6071 100644 --- a/indra/newview/llfloatertools.h +++ b/indra/newview/llfloatertools.h @@ -114,7 +114,6 @@ private: void refreshMedia(); void getMediaState(); void updateMediaSettings(); - void getMeidaState(); static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response); static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response); static void setObjectType( LLPCode pcode ); |