From b7c1b9f42b399a2743d1976ee96c40066d57e5dc Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 19 Apr 2013 20:10:05 -0400
Subject: [PATCH] Added OverrideAnimations string, so that notifications
 present an actual permission QUESTION when asking for the perm.

Conflicts:

	indra/newview/llviewermessage.cpp
---
 indra/newview/llviewermessage.cpp                           | 6 ++++--
 .../skins/default/xui/en-us/floater_chat_history.xml        | 1 +
 indra/newview/skins/default/xui/en-us/strings.xml           | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c151c691d..146d90d8f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -234,7 +234,8 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
 	"ChangePermissions",
 	"TrackYourCamera",
 	"ControlYourCamera",
-	"TeleportYourAgent"
+	"TeleportYourAgent",
+	"OverrideAnimations"
 };
 
 const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = 
@@ -250,7 +251,8 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
 	FALSE,	// ChangePermissions
 	FALSE,	// TrackYourCamera,
 	FALSE,	// ControlYourCamera
-	FALSE   // TeleportYourAgent
+	FALSE,	// TeleportYourAgent
+	FALSE	// OverrideAnimations
 };
 
 bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
diff --git a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 3d917fb28..6686a2ce8 100644
--- a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -22,6 +22,7 @@
 	<string name="TrackYourCamera">Track your camera</string>
 	<string name="TeleportYourAgent">Teleport you</string>
 	<string name="ControlYourCamera">Control your camera</string>
+	<string name="OverrideAnimations">Override your default animations</string>
 	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
 		<layout_panel border="false" bottom="0" height="260" left="0" min_width="275" name="im_contents_panel" width="305">
          <layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="260" left="0" orientation="vertical" name="im_contents_stack" width="305">
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 38c87d0d3..40b2f3f91 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -299,6 +299,7 @@
 	<string name="TrackYourCamera">Track your camera</string>
   <string name="ControlYourCamera">Control your camera</string>
   <string name="TeleportYourAgent">Teleport you</string>
+  <string name="OverrideAnimations">Override your default animations</string>
 
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">PG</string>