diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 11:52:44 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 11:52:44 -0500 |
| commit | 871e64726a147623f52776993ddced97bbf0e065 (patch) | |
| tree | d8941e09de552e354ad8b04a77f5f77fb71a4a6d /indra/newview/llpanelmaininventory.h | |
| parent | 045e3e06579d533619208fb415399e68714244e3 (diff) | |
| parent | f125039abcb566eaa7bdf33ce9c8c550cc25783a (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelmaininventory.h')
| -rw-r--r-- | indra/newview/llpanelmaininventory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h index 92443df369..920de2665c 100644 --- a/indra/newview/llpanelmaininventory.h +++ b/indra/newview/llpanelmaininventory.h @@ -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; } |