From 766af6102ec2f2d4f161966a39726af98ce4752f Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Fri, 20 Nov 2009 13:11:39 -0800 Subject: DEV-41991 DEV-42756 : un-do the "fix" for the race condition regarding media data overwriting. I think the problem is that this floater's state is not updated properly when the server response comes in. This needs more thought. --- indra/newview/llfloatertools.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 9854d2594b..386fb7f909 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -43,6 +43,7 @@ #include "llcheckboxctrl.h" #include "llcombobox.h" #include "lldraghandle.h" +#include "llerror.h" #include "llfloaterbuildoptions.h" #include "llfloatermediasettings.h" #include "llfloateropenobject.h" @@ -1122,11 +1123,27 @@ void LLFloaterTools::getMediaState() LLVOVolume* object = dynamic_cast(node->getObject()); if (NULL != object) { - if (!object->permModify() || object->isMediaDataBeingFetched()) + if (!object->permModify()) { + LL_INFOS("LLFloaterTools: media") + << "Selection not editable due to lack of modify permissions on object id " + << object->getID() << LL_ENDL; + editable = false; break; } + // XXX DISABLE this for now, because when the fetch finally + // does come in, the state of this floater doesn't properly + // update. This needs more thought. +// if (object->isMediaDataBeingFetched()) +// { +// LL_INFOS("LLFloaterTools: media") +// << "Selection not editable due to media data being fetched for object id " +// << object->getID() << LL_ENDL; +// +// editable = false; +// break; +// } } } } -- cgit v1.2.3 From daef055db99d79b700eb9aed63d869b64a45acb0 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Fri, 20 Nov 2009 16:26:43 -0800 Subject: Add log warning if media cap is missing --- indra/newview/llfloatertools.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloatertools.cpp') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 386fb7f909..88a98c3350 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1104,7 +1104,8 @@ void LLFloaterTools::getMediaState() childSetEnabled("edit_media", FALSE); childSetEnabled("media_info", FALSE); media_info->setEnabled(FALSE); - media_info->clear();*/ + media_info->clear();*/ + LL_WARNS("LLFloaterTools: media") << "Media not enabled (no capability) in this region!" << LL_ENDL; clearMediaSettings(); return; } -- cgit v1.2.3