summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-20 17:12:30 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-20 17:12:30 +0200
commitf4b8822aca5aeebaed56b4bfa3b762b3aa7d0640 (patch)
tree698944df6f944aa50ab446be91381f6789f6acb7 /indra/newview/llfloatertools.cpp
parent086135b6849bad2e3a5ddcf9bb9540fdb6fb72dd (diff)
parentf2af69c993190fcac87b91e299321fea9751444d (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r--indra/newview/llfloatertools.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 1287e14961..241497aeaf 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1134,7 +1134,8 @@ void LLFloaterTools::getMediaState()
}
// 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.
+ // update. Re-selecting fixes the problem, but there is
+ // contention as to whether this is a sufficient solution.
// if (object->isMediaDataBeingFetched())
// {
// LL_INFOS("LLFloaterTools: media")