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

Merge latest viewer 2-0 changes into media

master
skolb 2009-12-14 11:23:00 -08:00
parent 962a42a331 cbeadddbaf
commit 93f827ec78
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llpanelmaininventory.cpp
View File

@ -530,11 +530,23 @@ BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
return handled;
}
void LLPanelMainInventory::changed(U32 mask)
// virtual
void LLPanelMainInventory::changed(U32)
{
// empty, but must have this defined for abstract base class.
}
// virtual
void LLPanelMainInventory::draw()
{
if (mActivePanel && mFilterEditor)
{
mFilterEditor->setText(mActivePanel->getFilterSubString());
}
LLPanel::draw();
}
void LLPanelMainInventory::setFilterTextFromFilter()
{
mFilterText = mActivePanel->getFilter()->getFilterText();

3
indra/newview/llpanelmaininventory.h
View File

@ -72,7 +72,8 @@ public:
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
/*virtual*/ void changed(U32 mask);
/*virtual*/ void changed(U32);
/*virtual*/ void draw();
LLInventoryPanel* getPanel() { return mActivePanel; }
LLInventoryPanel* getActivePanel() { return mActivePanel; }