diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-11-19 22:17:37 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-11-19 22:17:37 +0200 |
| commit | 0c4ec8642471bacb4bf9d61283aa28af8015985a (patch) | |
| tree | c180d695398ce7fddf509033d43c892561ea4afa /indra/newview/llfloaterimcontainer.cpp | |
| parent | 7adfbc7b8261b928f177042a24a4a0b9138a3776 (diff) | |
MAINT-5297 Backed out changeset: dd9e3cbf10e5
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 91a0af3e8d..fc87e5dc5a 100755 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -926,8 +926,7 @@ void LLFloaterIMContainer::onCustomAction(const LLSD& userdata) } if ("view_icons" == command) { - gSavedSettings.setBOOL("ChatShowIcons", !(gSavedSettings.getBOOL("ChatShowIcons") && !gSavedSettings.getBOOL("GlobalShowIconsOverride"))); - gSavedSettings.setBOOL("GlobalShowIconsOverride", (!gSavedSettings.getBOOL("ChatShowIcons") && gSavedSettings.getBOOL("GlobalShowIconsOverride"))); + gSavedSettings.setBOOL("ChatShowIcons", !gSavedSettings.getBOOL("ChatShowIcons")); } if ("chat_preferences" == command) { @@ -981,7 +980,7 @@ BOOL LLFloaterIMContainer::isActionChecked(const LLSD& userdata) } if ("view_icons" == command) { - return gSavedSettings.getBOOL("ChatShowIcons") && !gSavedSettings.getBOOL("GlobalShowIconsOverride"); + return gSavedSettings.getBOOL("ChatShowIcons"); } if ("Translating.Enabled" == command) { |