summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-08 16:28:34 -0800
committerJames Cook <james@lindenlab.com>2009-12-08 16:28:34 -0800
commita65473957f16f9cfba8ed10b87218d65d64519ef (patch)
tree7724f4a40ddd3fa148f07f87ac199e5d1cb79277 /indra/newview/llviewermenu.cpp
parent5d4959e3a107a6a40014528dd8e17e46bf128540 (diff)
Back out EXT-2827 Unable to delete object when select face of object
May cause right-click delete to fail - testing that Backed out changeset: 1f8e1e73f9f4
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 066395aedf..0b40492391 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2422,12 +2422,6 @@ class LLObjectEnableReportAbuse : public view_listener_t
bool handleEvent(const LLSD& userdata)
{
bool new_value = LLSelectMgr::getInstance()->getSelection()->getObjectCount() != 0;
-/* // all the faces needs to be selected
- if(LLSelectMgr::getInstance()->getSelection()->contains(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(),SELECT_ALL_TES ))
- {
- new_value = true;
- }
- */
return new_value;
}
};
@@ -2816,7 +2810,6 @@ BOOL enable_has_attachments(void*)
bool enable_object_mute()
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-
bool new_value = (object != NULL);
if (new_value)
{
@@ -2829,19 +2822,6 @@ bool enable_object_mute()
BOOL is_self = avatar->isSelf();
new_value = !is_linden && !is_self;
}
- else
- {
- if( LLSelectMgr::getInstance()->getSelection()->contains(object,SELECT_ALL_TES ))
- {
- new_value = true;
- }
- else
- {
- new_value = false;
- }
-
- }
-
}
return new_value;
}