diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 18:06:48 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 18:06:48 -0700 |
| commit | 6d7ab5d1346a8c91563a83d0a5eee912d36a1488 (patch) | |
| tree | 46c59ba9be7963fef7bbf4b5616fb0f499a0118a | |
| parent | a6dedd63f9ff6c860e470a4bb7e3fda4aded3004 (diff) | |
EXP-1428 FIX Snapshot button does not toggle floater closed
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 9b28ab4bb5..0749093777 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1403,7 +1403,10 @@ void LLFloater::moveResizeHandlesToFront() BOOL LLFloater::isFrontmost() { - return gFloaterView && gFloaterView->getFrontmost() == this && getVisible(); + LLFloaterView* floater_view = getParentByType<LLFloaterView>(); + return getVisible() + && (floater_view + && floater_view->getFrontmost() == this); } void LLFloater::addDependentFloater(LLFloater* floaterp, BOOL reposition) |