diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-26 11:34:41 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-26 11:34:41 -0400 |
| commit | 40689e5b325d2f31c45b377effe6334f0b37c5f2 (patch) | |
| tree | 7f8048ddaf3971ff1dddfd0c2e6b3e8fde61e734 /indra/newview/llviewermenu.cpp | |
| parent | af57ff75dea16ed857c27ebfa288b9881668e9ac (diff) | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
Automated merge up from 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 3eaa8d53a4..ff9abb6b72 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4170,6 +4170,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 |