diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:03:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:03:36 -0700 |
| commit | 2e919b6ccdd947613896c7f30c4a72a4c568bb44 (patch) | |
| tree | 90ede528060756b307a996cff46f8be448a99aa2 /indra/newview/llviewermenu.cpp | |
| parent | 25c4f8ff46867ac1e600bf12521740fa8e14722e (diff) | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
merge with viewer-development
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ccf3df827d..68935d536b 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4160,6 +4160,11 @@ class LLObjectEnableReturn : public view_listener_t { bool handleEvent(const LLSD& userdata) { + if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) + { + // Do not enable if nothing selected + return false; + } #ifdef HACKED_GODLIKE_VIEWER bool new_value = true; #else |