diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 18:33:26 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 18:33:26 -0400 |
commit | af78acc037540ea7953ced111db7fb708e6965a2 (patch) | |
tree | ee295ca4b6dc7a40cdc50bc1dc708f40f928ce46 /indra/newview/llviewermenu.cpp | |
parent | 7ea7b236d88ec599c5bae561689b9d079256e551 (diff) | |
parent | 96d87aa85e84bb8327f4efd8bbf57f69bbdf0f03 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 731b2e9427..beca08203f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8291,8 +8291,6 @@ void initialize_menus() view_listener_t::addEnable(new LLUploadCostCalculator(), "Upload.CalculateCosts"); - - commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory)); enable.add("Conversation.IsConversationLoggingAllowed", boost::bind(&LLFloaterIMContainer::isConversationLoggingAllowed)); // Agent |