diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-17 16:26:26 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-17 16:26:26 -0700 |
| commit | 6c121d4540cb4f916dd5fc6e18078e6cc11478bf (patch) | |
| tree | 062533e68cd8f201450c5383ae78c0cdc5cd7fd6 /indra/newview/llsidepanelinventory.h | |
| parent | a6774820bc455160c6e7be70506aac205ca7eac2 (diff) | |
| parent | b022a9f15897cd3eb20f2c977e7c8e8f2660d27a (diff) | |
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(); // |