summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-04-05 15:24:22 -0400
committerNyx Linden <nyx@lindenlab.com>2013-04-05 15:24:22 -0400
commit3e53ade13e7c9e70ba67a1e845696712081f7651 (patch)
treec77ef8c210581c3b3852aeba205e8a5666c803a9 /indra/newview/llviewermenu.cpp
parent323a2f2235a52383bcfbae79bdce9e61ca808d2a (diff)
parent37303b9a2b58e3f66d246a0f4d2e6072eabcba86 (diff)
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp2
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