From 5d4959e3a107a6a40014528dd8e17e46bf128540 Mon Sep 17 00:00:00 2001 From: angela Date: Fri, 4 Dec 2009 22:25:12 +0800 Subject: EXT-2827 Unable to delete object when select face of object --- indra/newview/llviewermenu.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'indra/newview/llviewermenu.cpp') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0b40492391..066395aedf 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2422,6 +2422,12 @@ 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; } }; @@ -2810,6 +2816,7 @@ BOOL enable_has_attachments(void*) bool enable_object_mute() { LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); + bool new_value = (object != NULL); if (new_value) { @@ -2822,6 +2829,19 @@ 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; } -- cgit v1.2.3 From 9395d6f610d54f97c2e5dbc3f49c6dc33577eedc Mon Sep 17 00:00:00 2001 From: richard Date: Mon, 7 Dec 2009 15:58:05 -0800 Subject: ext-3152 - crash when opening debug console bad cast --- indra/newview/llviewermenu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermenu.cpp') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 9c52153ee4..7d673f536d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -45,6 +45,7 @@ #include "llagentwearables.h" #include "llagentpilot.h" #include "llcompilequeue.h" +#include "llconsole.h" #include "lldebugview.h" #include "llfilepicker.h" #include "llfirstuse.h" @@ -487,7 +488,7 @@ class LLAdvancedToggleConsole : public view_listener_t } else if ("debug" == console_type) { - toggle_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) ); + toggle_visibility( (void*)static_cast(gDebugView->mDebugConsolep)); } else if (gTextureSizeView && "texture size" == console_type) { -- cgit v1.2.3 From a65473957f16f9cfba8ed10b87218d65d64519ef Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 8 Dec 2009 16:28:34 -0800 Subject: 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 --- indra/newview/llviewermenu.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'indra/newview/llviewermenu.cpp') 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; } -- cgit v1.2.3