livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Richard Nelson 2010-05-26 17:50:04 -07:00
parent 8f8f611ee2 d8af94cddb
commit 05cde8e19d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llsidepaneltaskinfo.cpp
View File

@ -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);

2
indra/newview/llsidepaneltaskinfo.h
View File

@ -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);