diff options
| author | Richard Nelson <none@none> | 2010-05-26 16:42:12 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-05-26 16:42:12 -0700 |
| commit | d8af94cddb78917e2f4826c1cccac370598a1b97 (patch) | |
| tree | a4af1d8d8380a6b88d7b0b90ab3bcf9b5908323a /indra | |
| parent | 94dd5b68b992719562cba925ef803cd36ef2efc4 (diff) | |
EXT-4128 FIX After using Object Profile, edited objects remain highlighted when edit floater is closed
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsidepaneltaskinfo.cpp | 7 | ||||
| -rw-r--r-- | 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 6ebe55e362..e76397671b 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 e41627435f..15274c90db 100644 --- a/indra/newview/llsidepaneltaskinfo.h +++ b/indra/newview/llsidepaneltaskinfo.h @@ -54,7 +54,7 @@ public: virtual ~LLSidepanelTaskInfo(); /*virtual*/ BOOL postBuild(); - /*virtual*/ void setVisible(BOOL visible); + /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); void setObjectSelection(LLObjectSelectionHandle selection); |