diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-10-24 16:49:42 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-24 16:49:42 -0700 |
commit | c4387cbdb96a72bac7679f4268c492f808a354e6 (patch) | |
tree | 1562210826ce709299d0b98164e89097f7d5049a /indra/newview/llviewermenu.cpp | |
parent | 8d6e7fa02c0d5cd18f91ac6862079ff4fa0719d4 (diff) | |
parent | 46082c7d75b0acee167d4f0c0ef6bb2eacdef8d2 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 2345fbfd6a..e32716eca4 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7962,6 +7962,9 @@ void initialize_menus() view_listener_t::addEnable(new LLUploadCostCalculator(), "Upload.CalculateCosts"); + + commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory)); + // Agent commit.add("Agent.toggleFlying", boost::bind(&LLAgent::toggleFlying)); enable.add("Agent.enableFlying", boost::bind(&LLAgent::enableFlying)); @@ -8337,6 +8340,8 @@ void initialize_menus() view_listener_t::addMenu(new LLGoToObject(), "GoToObject"); commit.add("PayObject", boost::bind(&handle_give_money_dialog)); + commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory)); + enable.add("EnablePayObject", boost::bind(&enable_pay_object)); enable.add("EnablePayAvatar", boost::bind(&enable_pay_avatar)); enable.add("EnableEdit", boost::bind(&enable_object_edit)); |