aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefschat.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llprefschat.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 6ebc880..8d704d5 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -72,6 +72,7 @@ private:
72 BOOL mShowTimestamps; 72 BOOL mShowTimestamps;
73 BOOL mPlayTypingAnim; 73 BOOL mPlayTypingAnim;
74 BOOL mChatBubbles; 74 BOOL mChatBubbles;
75 BOOL mLocalChatBubbles;
75 BOOL mScriptErrorAsChat; 76 BOOL mScriptErrorAsChat;
76 BOOL mChatChannel; 77 BOOL mChatChannel;
77 F32 mConsoleOpacity; 78 F32 mConsoleOpacity;
@@ -106,6 +107,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
106 childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat")); 107 childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
107 108
108 childSetValue("bubble_text_chat", gSavedSettings.getBOOL("UseChatBubbles")); 109 childSetValue("bubble_text_chat", gSavedSettings.getBOOL("UseChatBubbles"));
110 childSetValue("local_bubble_text_chat", gSavedSettings.getBOOL("UseLocalChatWithBubbles"));
109 childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth")); 111 childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth"));
110 childSetValue("close_chat_on_return_check", gSavedSettings.getBOOL("CloseChatOnReturn")); 112 childSetValue("close_chat_on_return_check", gSavedSettings.getBOOL("CloseChatOnReturn"));
111 childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim")); 113 childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim"));
@@ -135,6 +137,7 @@ void LLPrefsChatImpl::refreshValues()
135 mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps"); 137 mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps");
136 mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat"); 138 mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat");
137 mChatBubbles = gSavedSettings.getBOOL("UseChatBubbles"); 139 mChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
140 mLocalChatBubbles = gSavedSettings.getBOOL("UseLocalChatWithBubbles");
138 mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth"); 141 mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
139 mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn"); 142 mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
140 mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 143 mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim");
@@ -164,6 +167,7 @@ void LLPrefsChatImpl::cancel()
164 gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps); 167 gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps);
165 gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat); 168 gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat);
166 gSavedSettings.setBOOL("UseChatBubbles", mChatBubbles); 169 gSavedSettings.setBOOL("UseChatBubbles", mChatBubbles);
170 gSavedSettings.setBOOL("UseLocalChatWithBubbles", mLocalChatBubbles);
167 gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth); 171 gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth);
168 gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn); 172 gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn);
169 gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 173 gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim);
@@ -196,6 +200,7 @@ void LLPrefsChatImpl::apply()
196 gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check")); 200 gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check"));
197 gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat")); 201 gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
198 gSavedSettings.setBOOL("UseChatBubbles", childGetValue("bubble_text_chat")); 202 gSavedSettings.setBOOL("UseChatBubbles", childGetValue("bubble_text_chat"));
203 gSavedSettings.setBOOL("UseLocalChatWithBubbles", childGetValue("local_bubble_text_chat"));
199 gSavedSettings.setBOOL("ChatFullWidth", childGetValue("chat_full_width_check")); 204 gSavedSettings.setBOOL("ChatFullWidth", childGetValue("chat_full_width_check"));
200 gSavedSettings.setBOOL("CloseChatOnReturn", childGetValue("close_chat_on_return_check")); 205 gSavedSettings.setBOOL("CloseChatOnReturn", childGetValue("close_chat_on_return_check"));
201 gSavedSettings.setBOOL("PlayTypingAnim", childGetValue("play_typing_animation")); 206 gSavedSettings.setBOOL("PlayTypingAnim", childGetValue("play_typing_animation"));