diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-03 10:49:07 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-03 10:49:07 +0100 |
| commit | d3060e64a2aee975320e10a6c240387f04dc973c (patch) | |
| tree | 7e775a7964d7574cf2cbe462137675ad1ee23ed6 /indra/newview/llsidepanelinventory.h | |
| parent | b8daec6144bfe064eb9b43e776ec21f997de2923 (diff) | |
| parent | daec4f6bb75634c6355f58d9fa5ef60f50a2e73f (diff) | |
merge from PE's viewer-release. conflicts resolved.
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rw-r--r-- | indra/newview/llsidepanelinventory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index 951fdd630c..f2f2509f9a 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -58,6 +58,9 @@ public: void showTaskInfoPanel(); void showInventoryPanel(); + // checks can share selected item(s) + bool canShare(); + protected: // Tracks highlighted (selected) item in inventory panel. LLInventoryItem *getSelectedItem(); @@ -65,8 +68,6 @@ protected: void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action); // "wear", "teleport", etc. void performActionOnSelection(const std::string &action); - bool canShare(); - void updateVerbs(); // |