diff options
author | Dave Parks <davep@lindenlab.com> | 2010-04-14 12:12:03 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-04-14 12:12:03 -0500 |
commit | a7e1745bed2e8c22843b946700b4ae9c8fbf8ac9 (patch) | |
tree | 40d0b8bc9c5715f55e2870c5e2e4b534e01a774b /indra/newview/llpanelmaininventory.cpp | |
parent | 6b72149cf7ad90c0036d9b037594b0a8e86dc483 (diff) | |
parent | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 8be4c8402c..0ba373c51b 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -34,6 +34,7 @@ #include "llpanelmaininventory.h" #include "llagent.h" +#include "llavataractions.h" #include "lldndbutton.h" #include "lleconomy.h" #include "llfilepicker.h" @@ -116,6 +117,7 @@ LLPanelMainInventory::LLPanelMainInventory() mCommitCallbackRegistrar.add("Inventory.ShowFilters", boost::bind(&LLPanelMainInventory::toggleFindOptions, this)); mCommitCallbackRegistrar.add("Inventory.ResetFilters", boost::bind(&LLPanelMainInventory::resetFilters, this)); mCommitCallbackRegistrar.add("Inventory.SetSortBy", boost::bind(&LLPanelMainInventory::setSortBy, this, _2)); + mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars)); // Controls // *TODO: Just use persistant settings for each of these |