diff options
author | James Cook <james@lindenlab.com> | 2010-06-01 14:33:44 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-06-01 14:33:44 -0700 |
commit | 49c221b9678c33d5dbe71a68ca35d0b28fff3edd (patch) | |
tree | 0214531fe7d433a220240b766d928f7a49e2ed92 /indra/newview/llsidepaneltaskinfo.cpp | |
parent | 010dba68ad923cf66b1e05e6969a21f7288fe78a (diff) | |
parent | 7ea46b968cf7df3afc1e879f90f1124157f5a79d (diff) |
Merge with dessie/viewer-public in prep to land code there
Diffstat (limited to 'indra/newview/llsidepaneltaskinfo.cpp')
-rw-r--r-- | indra/newview/llsidepaneltaskinfo.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 2a0360460c..475a6b1da7 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); |