diff options
author | Merov Linden <merov@lindenlab.com> | 2011-10-24 19:33:44 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-10-24 19:33:44 -0700 |
commit | 9ba474774706f8b3af39a46ac57dd94c5e563a0e (patch) | |
tree | fa54859fcac9ec888f7affa2df2eec4ecc26ee1a /indra/newview/llviewermenu.cpp | |
parent | 5b0a1ac026e0ca06526cc0c03325b223a051ea63 (diff) | |
parent | 71bc6007471f3303c0ddf4ab7fd8f57ec52b3f56 (diff) |
Pull from richard/viewer-experience-fui
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)); |