diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-21 17:12:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-21 17:12:24 -0700 |
| commit | 6f4a21531ae7e5d095034f7315501421dd94d124 (patch) | |
| tree | 69b7186d67b7fd6c2d85926eb02e97aea5edb538 | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
STORM-173 : never enable return object if no object selected
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ccf3df827d..dc7c6f17a9 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4160,6 +4160,12 @@ class LLObjectEnableReturn : public view_listener_t { bool handleEvent(const LLSD& userdata) { + LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(); + if (!node) + { + // Do not enable if nothing selected + return false; + } #ifdef HACKED_GODLIKE_VIEWER bool new_value = true; #else |