Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to disable chat animation

Browse Source
This commit is contained in:
Siana Gearz
2012-02-06 03:52:25 +01:00
parent 8a49d4ef94
commit 8450386330
5 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/app_settings/settings_ascent_coa.xml
View File

@@ -2,7 +2,22 @@
<llsd>
<map>
<!-- Ascent's Optionally Account-Specific Settings -->
<key>MoyMiniMapCustomColor</key>
<key>SGDisableChatAnimation</key>
<map>
<key>Comment</key>
<string>Disable whisper, chat and shout animations on your avatar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>MoyMiniMapCustomColor</key>
<map>
<key>Comment</key>
<string>Custom minimap color you wish to have.</string>

2
indra/newview/ascentprefsvan.cpp
View File

@@ -218,6 +218,7 @@ void LLPrefsAscentVan::refreshValues()
mShowTPScreen = !gSavedSettings.getBOOL("AscentDisableTeleportScreens");
mPlayTPSound = gSavedSettings.getBOOL("OptionPlayTpSound");
mShowLogScreens = !gSavedSettings.getBOOL("AscentDisableLogoutScreens");
mDisableChatAnimation = gSavedSettings.getBOOL("SGDisableChatAnimation");
//Tags\Colors ----------------------------------------------------------------------------
mAscentUseTag = gSavedSettings.getBOOL("AscentUseTag");
@@ -291,6 +292,7 @@ void LLPrefsAscentVan::cancel()
gSavedSettings.setBOOL("AscentDisableTeleportScreens", !mShowTPScreen);
gSavedSettings.setBOOL("OptionPlayTpSound", mPlayTPSound);
gSavedSettings.setBOOL("AscentDisableLogoutScreens", !mShowLogScreens);
gSavedSettings.setBOOL("SGDisableChatAnimation", mDisableChatAnimation);
//Tags\Colors ----------------------------------------------------------------------------
gSavedSettings.setBOOL("AscentUseTag", mAscentUseTag);

1
indra/newview/ascentprefsvan.h
View File

@@ -57,6 +57,7 @@ protected:
BOOL mShowTPScreen;
BOOL mPlayTPSound;
BOOL mShowLogScreens;
bool mDisableChatAnimation;
//Tags\Colors
BOOL mAscentUseTag;
std::string mReportClientUUID;

4
indra/newview/llchatbar.cpp
View File

@@ -685,8 +685,10 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
}
// [/RLVa:KB]
LLCachedControl<bool> disable_chat_animation("SGDisableChatAnimation");
// Don't animate for chats people can't hear (chat to scripts)
if (animate && (channel == 0))
if (animate && (channel == 0) && !disable_chat_animation)
{
if (type == CHAT_TYPE_WHISPER)
{

1
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
View File

@@ -6,6 +6,7 @@
<check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Hide the Teleport progress screens" tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs." name="disable_tp_screen_check"/>
<check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Play the Teleport sound when moving between sims" tool_tip="Viewer will play the wooshing TP noise on teleport." name="tp_sound_check"/>
<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Hide the Login/Logout progress screens" tool_tip="If checked, the viewer will hide the login/logout progress screen." name="disable_logout_screen_check"/>
<check_box bottom_delta="-20" control_name="SGDisableChatAnimation" follows="top" height="16" initial_value="false" label="Disable chat, whisper and shout animations" tool_tip="Remove chat animations from your own avatar. Effect visible to everyone" name="disable_chat_animation"/>
</panel>
<panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
<!-- Client tag options -->