summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-21 20:23:26 -0400
committerOz Linden <oz@lindenlab.com>2011-04-21 20:23:26 -0400
commitb15dca22637b0b2c1947b758a93f51163fb48cf1 (patch)
tree80aa8e85d95dc2b2dc1085d9d504ce3ea552bf4e /indra/newview/llfloaterpreference.cpp
parent79dceafdfd767e264e3a21e12cb73e52f57cfe06 (diff)
parent7577ec25a066c5bb9b39978e32b8da084b1916d7 (diff)
merge changes for storm-1095
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index c72cf13745..b4b12024aa 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -411,6 +411,8 @@ BOOL LLFloaterPreference::postBuild()
gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2));
+ gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLViewerChat::signalChatFontChanged));
+
gSavedSettings.getControl("ChatBubbleOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2));
LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");