Second Life viewer sources 1.22.4-RC

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index bb84f43..33effdc 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -349,7 +349,8 @@ class LLFileEnableCloseWindow : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
+                bool new_value = NULL != LLFloater::getClosableFloaterFromFocus();
+
                 // horrendously opaque, this code
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;