From 41303d0c9cf86124e1530113ce926954888a28b5 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Wed, 23 Oct 2013 17:44:27 -0400 Subject: [PATCH] Added "Log button opens external text editor (Windows only)" to Adv. Chat UI --- indra/newview/ascentprefschat.cpp | 2 ++ indra/newview/ascentprefschat.h | 1 + .../skins/default/xui/en-us/panel_preferences_ascent_chat.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp index 5def0f4bb..d504a38fa 100644 --- a/indra/newview/ascentprefschat.cpp +++ b/indra/newview/ascentprefschat.cpp @@ -297,6 +297,7 @@ void LLPrefsAscentChat::refreshValues() mOneLineConfButt = gSavedSettings.getBOOL("UseConciseConferenceButtons"); mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut"); mItalicizeActions = gSavedSettings.getBOOL("LiruItalicizeActions"); + mLegacyLogLaunch = gSavedSettings.getBOOL("LiruLegacyLogLaunch"); mLegacySpeakerNames = gSavedSettings.getBOOL("LiruLegacySpeakerNames"); //Autoresponse ------------------------------------------------------------------------ @@ -535,6 +536,7 @@ void LLPrefsAscentChat::cancel() gSavedSettings.setBOOL("UseConciseConferenceButtons", mOneLineConfButt); gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm); gSavedSettings.setBOOL("LiruItalicizeActions", mItalicizeActions); + gSavedSettings.setBOOL("LiruLegacyLogLaunch", mLegacyLogLaunch); gSavedSettings.setBOOL("LiruLegacySpeakerNames", mLegacySpeakerNames); //Autoresponse ------------------------------------------------------------------------ diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h index 5e0ecd707..f4232bfd8 100644 --- a/indra/newview/ascentprefschat.h +++ b/indra/newview/ascentprefschat.h @@ -87,6 +87,7 @@ protected: bool mOnlyComm; bool mItalicizeActions; bool mLegacySpeakerNames; + bool mLegacyLogLaunch; //Autoresponse ------------------------------------------------------------------------ std::string mIMResponseAnyoneItemID; diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml index 82f6429bb..3d2b1325d 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml @@ -59,6 +59,7 @@ +