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

Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm.

Browse Source
This commit is contained in:
Lirusaito
2013-04-19 20:10:05 -04:00
parent c79487d3da
commit eac5a45562
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermessage.cpp
View File

@@ -185,7 +185,8 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
"ChangePermissions", "ChangePermissions",
"TrackYourCamera", "TrackYourCamera",
"ControlYourCamera", "ControlYourCamera",
"TeleportYourAgent" "TeleportYourAgent",
"OverrideAnimations"
}; };
const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
@@ -201,7 +202,8 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
FALSE, // ChangePermissions FALSE, // ChangePermissions
FALSE, // TrackYourCamera, FALSE, // TrackYourCamera,
FALSE, // ControlYourCamera FALSE, // ControlYourCamera
FALSE // TeleportYourAgent FALSE, // TeleportYourAgent
FALSE // OverrideAnimations
}; };
bool friendship_offer_callback(const LLSD& notification, const LLSD& response) bool friendship_offer_callback(const LLSD& notification, const LLSD& response)

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

@@ -22,6 +22,7 @@
<string name="TrackYourCamera">Track your camera</string> <string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string> <string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</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_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_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"> <layout_stack border="false" bottom="0" default_tab_group="1" follows="all" height="260" left="0" orientation="vertical" name="im_contents_stack" width="305">

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

@@ -300,6 +300,7 @@
<string name="TrackYourCamera">Track your camera</string> <string name="TrackYourCamera">Track your camera</string>
<string name="ControlYourCamera">Control your camera</string> <string name="ControlYourCamera">Control your camera</string>
<string name="TeleportYourAgent">Teleport you</string> <string name="TeleportYourAgent">Teleport you</string>
<string name="OverrideAnimations">Override your default animations</string>
<!-- Sim Access labels --> <!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string> <string name="SIM_ACCESS_PG">PG</string>