diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-23 15:03:10 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-23 15:03:10 -0500 |
| commit | eee7b77ed80b7f966f68a0a5536c88d59cc3f6b2 (patch) | |
| tree | 3d45001d56801e1a01fc9554b3891b101d5a3547 /indra/newview/llfloaterpreference.cpp | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
| parent | 1cc154166fe504e17735669b7b9e366f93e34d64 (diff) | |
merge changes for storm-1738
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index a333989e7e..368d8f1efe 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -35,7 +35,7 @@ #include "llfloaterpreference.h" #include "message.h" - +#include "llautocorrectfloater.h" #include "llagent.h" #include "llavatarconstants.h" #include "llcheckboxctrl.h" @@ -354,6 +354,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2)); gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2)); gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged, _2)); + + mCommitCallbackRegistrar.add("Pref.ShowAC", boost::bind(&AutoCorrectFloater::showFloater)); LLAvatarPropertiesProcessor::getInstance()->addObserver( gAgent.getID(), this ); } |