summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorWolfpup Lowenhar <wolfpup67@earthlink.net>2010-10-25 22:24:44 -0400
committerWolfpup Lowenhar <wolfpup67@earthlink.net>2010-10-25 22:24:44 -0400
commit2e023b0affb733c025e4c15d6551236c8eb28950 (patch)
tree5721e9651934a6cb01554a3087f252f3005a4101 /indra/newview/llviewermenu.cpp
parent6da1e54e6a8b66a2cad7c8c89de279ca5b9ac7dd (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