diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-11 17:51:00 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-11 17:51:00 -0800 |
| commit | b4e738e5034cde1699a7a3cbe51b84c3294eedd0 (patch) | |
| tree | a635b92a70a86ff5d78b483064815fe7c3e083a2 /indra/newview/llviewermenu.cpp | |
| parent | 34558181c7fad95c235bca1e29c282ca09d136ba (diff) | |
| parent | 8037b435883f6d0cc0ba01e4f5bdbeea47c99074 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 7ae717cb42..fe9c00cc27 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -59,6 +59,7 @@ #include "llbuycurrencyhtml.h" #include "llfloatergodtools.h" #include "llfloaterinventory.h" +#include "llfloaterimcontainer.h" #include "llfloaterland.h" #include "llfloaterpathfindingcharacters.h" #include "llfloaterpathfindinglinksets.h" @@ -8238,6 +8239,7 @@ void initialize_menus() commit.add("Inventory.NewWindow", boost::bind(&LLFloaterInventory::showAgentInventory)); + enable.add("Conversation.IsConversationLoggingAllowed", boost::bind(&LLFloaterIMContainer::isConversationLoggingAllowed)); // Agent commit.add("Agent.toggleFlying", boost::bind(&LLAgent::toggleFlying)); |