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

Add script teleport permission

Browse Source
This commit is contained in:
Siana Gearz
2012-08-13 02:36:04 +02:00
parent 0b1a5bc3c1
commit 7335ae548c
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llviewermessage.cpp
View File

@@ -219,19 +219,20 @@ const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
//script permissions //script permissions
const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
{ {
"ScriptTakeMoney", "ScriptTakeMoney",
"ActOnControlInputs", "ActOnControlInputs",
"RemapControlInputs", "RemapControlInputs",
"AnimateYourAvatar", "AnimateYourAvatar",
"AttachToYourAvatar", "AttachToYourAvatar",
"ReleaseOwnership", "ReleaseOwnership",
"LinkAndDelink", "LinkAndDelink",
"AddAndRemoveJoints", "AddAndRemoveJoints",
"ChangePermissions", "ChangePermissions",
"TrackYourCamera", "TrackYourCamera",
"ControlYourCamera" "ControlYourCamera",
}; "TeleportYourAgent"
};
const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
{ {
@@ -245,7 +246,8 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
FALSE, // AddAndRemoveJoints FALSE, // AddAndRemoveJoints
FALSE, // ChangePermissions FALSE, // ChangePermissions
FALSE, // TrackYourCamera, FALSE, // TrackYourCamera,
FALSE // ControlYourCamera FALSE, // ControlYourCamera
FALSE // TeleportYourAgent
}; };
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

@@ -20,6 +20,7 @@
<string name="AddAndRemoveJoints">Add and remove joints with other objects</string> <string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
<string name="ChangePermissions">Change its permissions</string> <string name="ChangePermissions">Change its permissions</string>
<string name="TrackYourCamera">Track your camera</string> <string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</string> <string name="ControlYourCamera">Control your camera</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" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305"> <layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">

3
indra/newview/skins/default/xui/es/floater_chat_history.xml
View File

@@ -60,6 +60,9 @@
<string name="ControlYourCamera"> <string name="ControlYourCamera">
Controlar tu cámara Controlar tu cámara
</string> </string>
<string name="TeleportYourAgent">
Teleportarte
</string>
<layout_stack name="panels"> <layout_stack name="panels">
<layout_panel name="im_contents_panel"> <layout_panel name="im_contents_panel">
<combo_box label="Gestos" name="Gesture"> <combo_box label="Gestos" name="Gesture">

3
indra/newview/skins/default/xui/fr/floater_chat_history.xml
View File

@@ -60,6 +60,9 @@
<string name="ControlYourCamera"> <string name="ControlYourCamera">
Contrôler votre caméra Contrôler votre caméra
</string> </string>
<string name="TeleportYourAgent">
Vous téléporter
</string>
<layout_stack name="panels"> <layout_stack name="panels">
<layout_panel name="im_contents_panel"> <layout_panel name="im_contents_panel">
<combo_box label="Gestures" name="Gesture"> <combo_box label="Gestures" name="Gesture">