aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsadvanced.cpp
diff options
context:
space:
mode:
authorelektrahesse2010-09-09 18:48:15 +0200
committerMcCabe Maxsted2010-09-10 19:11:30 -0700
commit0fbdd7d10de8fa253cb008504e9e8dc44ed16b29 (patch)
treebbc9e681097656d61c2b3d5368ebb6491de62421 /linden/indra/newview/llprefsadvanced.cpp
parentRemoved Object-Object Occlusion shortcut as it interferes with the AO (diff)
downloadmeta-impy-0fbdd7d10de8fa253cb008504e9e8dc44ed16b29.zip
meta-impy-0fbdd7d10de8fa253cb008504e9e8dc44ed16b29.tar.gz
meta-impy-0fbdd7d10de8fa253cb008504e9e8dc44ed16b29.tar.bz2
meta-impy-0fbdd7d10de8fa253cb008504e9e8dc44ed16b29.tar.xz
Fixed chat colors and added group im colors
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llprefsadvanced.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 695e604..898ba2c 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -112,6 +112,7 @@ BOOL LLPrefsAdvanced::postBuild()
112 112
113 initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck"); 113 initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck");
114 114
115 childSetValue("HighlightOwnNameInIM", gSavedSettings.getBOOL("HighlightOwnNameInIM"));
115 childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat")); 116 childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat"));
116 getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor")); 117 getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
117 childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat")); 118 childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
@@ -139,6 +140,7 @@ void LLPrefsAdvanced::apply()
139 gSavedSettings.setU32("LightShareAllowed", 140 gSavedSettings.setU32("LightShareAllowed",
140 (U32)childGetValue("lightshare_combo").asInteger()); 141 (U32)childGetValue("lightshare_combo").asInteger());
141 142
143 gSavedSettings.setBOOL("HighlightOwnNameInIM", childGetValue("HighlightOwnNameInIM"));
142 gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat")); 144 gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat"));
143 gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get()); 145 gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get());
144 gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat")); 146 gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));