diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-27 19:54:10 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-09-27 19:54:10 +0100 |
commit | a84ee929a5221aec07bcc93815ca6c57bb8ab6bb (patch) | |
tree | ecf9694b9e772161b67c8b0935362b0e05cc7c7d /indra/newview/llfloatertools.cpp | |
parent | 4d4255c27b45ed5e32fe7c4870e2ce3ed10cb140 (diff) | |
parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r-- | indra/newview/llfloatertools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 7fc60ddaac..ee4fdbe9a5 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1225,7 +1225,7 @@ void LLFloaterTools::getMediaState() if(!has_media_capability) { getChildView("add_media")->setEnabled(FALSE); - LL_WARNS("LLFloaterTools: media") << "Media not enabled (no capability) in this region!" << LL_ENDL; + LL_WARNS("LLFloaterToolsMedia") << "Media not enabled (no capability) in this region!" << LL_ENDL; clearMediaSettings(); return; } @@ -1249,7 +1249,7 @@ void LLFloaterTools::getMediaState() { if (!object->permModify()) { - LL_INFOS("LLFloaterTools: media") + LL_INFOS("LLFloaterToolsMedia") << "Selection not editable due to lack of modify permissions on object id " << object->getID() << LL_ENDL; @@ -1262,7 +1262,7 @@ void LLFloaterTools::getMediaState() // contention as to whether this is a sufficient solution. // if (object->isMediaDataBeingFetched()) // { -// LL_INFOS("LLFloaterTools: media") +// LL_INFOS("LLFloaterToolsMedia") // << "Selection not editable due to media data being fetched for object id " // << object->getID() << LL_ENDL; // |