diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
| commit | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch) | |
| tree | 47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/newview/llpanelobjectinventory.cpp | |
| parent | f480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff) | |
| parent | 8dd62863092b10e012db20e818e72b53fd2ed84a (diff) | |
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 47a27c8a85..0f1a02079e 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -46,6 +46,7 @@ #include "roles_constants.h" #include "llagent.h" +#include "llavataractions.h" #include "llcallbacklist.h" #include "llfloaterbuycurrency.h" #include "llfloaterreg.h" @@ -1645,6 +1646,7 @@ LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Par mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&do_nothing)); mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&do_nothing)); mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&do_nothing)); + mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars)); } // Destroys the object |