diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 14:14:41 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 14:14:41 -0800 |
| commit | 6a1a8210932bc84da34f60b4ee9c28bfe9d77b08 (patch) | |
| tree | 9f92db15d665f9b23b11c20bfd4e8b3b00150527 /indra/newview/llfloatertools.cpp | |
| parent | fe5b3662cb13a2513205e47c93a76ed44084edc7 (diff) | |
| parent | 60f4808ede9a085e7a87ef5a1176eb523cfc67d5 (diff) | |
merge!
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 3 |
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") |