diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-11 14:45:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-11 14:45:31 -0400 |
| commit | fb44dbb164b08b61c7ac4ab6e0565c972ee0e66b (patch) | |
| tree | bb81ec3b3ddd75e665b00dcbd201952749f9e1c0 /indra/newview/llfloaterpreference.cpp | |
| parent | 6d9c0fab8f2c19fa624e3c1f697ee9c7f08d9245 (diff) | |
move preferences from Advanced menu to Chat tab of preferences floater
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 362904f0f8..7ef8125896 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -346,7 +346,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.BlockList", boost::bind(&LLFloaterPreference::onClickBlockList, this)); mCommitCallbackRegistrar.add("Pref.Proxy", boost::bind(&LLFloaterPreference::onClickProxySettings, this)); mCommitCallbackRegistrar.add("Pref.TranslationSettings", boost::bind(&LLFloaterPreference::onClickTranslationSettings, this)); - + mCommitCallbackRegistrar.add("Pref.AutoReplace.", boost::bind(&AutoReplaceFloater::showFloater, this)); + sSkin = gSavedSettings.getString("SkinCurrent"); mCommitCallbackRegistrar.add("Pref.ClickActionChange", boost::bind(&LLFloaterPreference::onClickActionChange, this)); @@ -355,8 +356,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2)); gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged, _2)); - mCommitCallbackRegistrar.add("Pref.ShowAC", boost::bind(&AutoReplaceFloater::showFloater)); - LLAvatarPropertiesProcessor::getInstance()->addObserver( gAgent.getID(), this ); } |