From d8af94cddb78917e2f4826c1cccac370598a1b97 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Wed, 26 May 2010 16:42:12 -0700
Subject: [PATCH] EXT-4128 FIX After using Object Profile, edited objects
remain highlighted when edit floater is closed
---
indra/newview/llsidepaneltaskinfo.cpp | 7 ++++---
indra/newview/llsidepaneltaskinfo.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 6ebe55e3625..e76397671bf 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -125,10 +125,8 @@ BOOL LLSidepanelTaskInfo::postBuild()
return TRUE;
}
-// virtual
-void LLSidepanelTaskInfo::setVisible(BOOL visible)
+/*virtual*/ void LLSidepanelTaskInfo::handleVisibilityChange ( BOOL visible )
{
- LLPanel::setVisible(visible);
if (visible)
{
sActivePanel = this;
@@ -137,9 +135,12 @@ void LLSidepanelTaskInfo::setVisible(BOOL visible)
else
{
sActivePanel = NULL;
+ // drop selection reference
+ mObjectSelection = NULL;
}
}
+
void LLSidepanelTaskInfo::disableAll()
{
childSetEnabled("perm_modify", FALSE);
diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index e41627435fd..15274c90db7 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -54,7 +54,7 @@ class LLSidepanelTaskInfo : public LLSidepanelInventorySubpanel
virtual ~LLSidepanelTaskInfo();
/*virtual*/ BOOL postBuild();
- /*virtual*/ void setVisible(BOOL visible);
+ /*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
void setObjectSelection(LLObjectSelectionHandle selection);
--
GitLab