diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-25 13:45:06 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-25 13:45:06 -0700 |
| commit | 0977ecca9622e6d9dbadfaf55c7809720ce6d7ab (patch) | |
| tree | eeb1054230e1a7fd0be4df886884ecd9969ed167 /indra | |
| parent | 3116e0d3525ba5cef9923a156bcbf405201b70c0 (diff) | |
| parent | c0e9594e9d509ba665c3b5a2fe01049b0dbb92fd (diff) | |
STORM-173 : merge with viewer-development
Diffstat (limited to 'indra')
| -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 |