summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-10-25 23:29:49 +0100
committerTofu Buzzard <no-email>2010-10-25 23:29:49 +0100
commit26700e0d40c5f650e713f5209dd80b5df84b2b5a (patch)
tree03fe24d0bb133c03bfe0b4afe14eeaea90fa0d44 /indra/newview/llviewermenu.cpp
parentad033a4b35387a343f2204cda64ecb590888b60e (diff)
parenta40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff)
merge from viewer-development.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp5
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