diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 10:50:17 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 10:50:17 -0800 |
| commit | d550339958c14f0d7fd222a8531df639eac49e63 (patch) | |
| tree | 2adfe920202a4304fc37446fca5f9bd368995749 /indra/newview/llfloaterpreference.cpp | |
| parent | 6e1f6f015394a3f268608061c00993939c891e54 (diff) | |
| parent | 3c8f89246712d1e5391ab1bdd6bbc36a83f210d8 (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 83c784c1f7..5128a7b861 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -106,6 +106,7 @@ #include "llviewermedia.h" #include "llpluginclassmedia.h" #include "llteleporthistorystorage.h" +#include "llnearbychat.h" #include <boost/regex.hpp> @@ -361,6 +362,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) BOOL LLFloaterPreference::postBuild() { gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLIMFloater::processChatHistoryStyleUpdate, _2)); + + gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2)); LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab"))) |