diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-17 17:43:22 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-17 17:43:22 -0400 |
| commit | d3b9c8944b7730b54796ef79cd78d62fd585fe42 (patch) | |
| tree | 45f6b8ca78e3fe931c793f5ffbfdbfe207532e29 /indra/newview/llsidepanelinventory.h | |
| parent | 408484d0c133627a1a5e3586aa34015d89b23379 (diff) | |
| parent | 8d84b6e82d17eb11622b3d80254ccc4ac15c5bec (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rw-r--r-- | indra/newview/llsidepanelinventory.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index a038f99853..13275d14c0 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -54,6 +54,10 @@ public: LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; } BOOL isMainInventoryPanelActive() const; + void showItemInfoPanel(); + void showTaskInfoPanel(); + void showInventoryPanel(); + protected: // Tracks highlighted (selected) item in inventory panel. LLInventoryItem *getSelectedItem(); @@ -63,9 +67,6 @@ protected: void performActionOnSelection(const std::string &action); bool canShare(); - void showItemInfoPanel(); - void showTaskInfoPanel(); - void showInventoryPanel(); void updateVerbs(); // |