diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
| commit | b770415b6a2f52946eafb99800af7409b900cd8e (patch) | |
| tree | 11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/newview/llsidepanelinventory.h | |
| parent | be72a10a89f98a5c7c372ecee3d839be2031b80a (diff) | |
| parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) | |
Merge (and resolve conflict) from q/viewer-release
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rw-r--r-- | indra/newview/llsidepanelinventory.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index 2dc17e741d..13275d14c0 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -51,8 +51,13 @@ public: /*virtual*/ void onOpen(const LLSD& key); LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any. + LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; } BOOL isMainInventoryPanelActive() const; + void showItemInfoPanel(); + void showTaskInfoPanel(); + void showInventoryPanel(); + protected: // Tracks highlighted (selected) item in inventory panel. LLInventoryItem *getSelectedItem(); @@ -62,9 +67,6 @@ protected: void performActionOnSelection(const std::string &action); bool canShare(); - void showItemInfoPanel(); - void showTaskInfoPanel(); - void showInventoryPanel(); void updateVerbs(); // |