merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 272 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
new file mode 100644
index 0000000000..22dc0aa0d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="top|left"
+ height="320"
+ label="Debug"
+ layout="topleft"
+ left="0"
+ name="Debug"
+ top="320"
+ width="480">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="region_text_lbl"
+     top="10"
+     width="100">
+        Region:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="region_text"
+     top_delta="0"
+     width="400">
+        unknown
+    </text>
+    <check_box
+     height="20"
+     label="Disable Scripts"
+     layout="topleft"
+     left="10"
+     name="disable_scripts_check"
+     tool_tip="Disable all scripts in this region"
+     top="30"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="70"
+     name="disable_scripts_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Disable Collisions"
+     layout="topleft"
+     left="10"
+     name="disable_collisions_check"
+     tool_tip="Disable non-avatar collisions in this region"
+     top="50"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="70"
+     name="disable_collisions_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Disable Physics"
+     layout="topleft"
+     left="10"
+     name="disable_physics_check"
+     tool_tip="Disable all physics in this region"
+     top="70"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="70"
+     name="disable_physics_help"
+     top_delta="2"
+     width="18" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="60"
+     name="apply_btn"
+     top="100"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="objret_text_lbl"
+     top="150"
+     width="90">
+        Object Return
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="30"
+     name="resident_text_lbl"
+     top="175"
+     width="60">
+        Resident:
+    </text>
+    <line_editor
+     type="string"
+     length="1"
+     border_style="line"
+     border_thickness="1"
+     enabled="false"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_delta="60"
+     mouse_opaque="false"
+     name="target_avatar_name"
+     top_delta="-2"
+     width="180">
+        (none)
+    </line_editor>
+    <button
+     follows="left|top"
+     height="20"
+     label="Choose..."
+     layout="topleft"
+     left_pad="10"
+     name="choose_avatar_btn"
+     top_delta="0"
+     width="80" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="30"
+     name="options_text_lbl"
+     top="198"
+     width="60">
+        Options:
+    </text>
+    <check_box
+     height="20"
+     label="Return only those objects with scripts"
+     layout="topleft"
+     left_delta="60"
+     name="return_scripts"
+     tool_tip="Return only objects which have scripts."
+     top_delta="0"
+     width="80" />
+    <check_box
+     height="20"
+     label="Return only those objects on someone else&apos;s land"
+     layout="topleft"
+     left_delta="0"
+     name="return_other_land"
+     tool_tip="Return only objects which are on land belonging to someone else"
+     top_delta="20"
+     width="80" />
+    <check_box
+     height="20"
+     label="Return objects in every region of this estate"
+     layout="topleft"
+     left_delta="0"
+     name="return_estate_wide"
+     tool_tip="Return objects in all of the regions that make up this estate"
+     top_delta="20"
+     width="80" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Return"
+     layout="topleft"
+     left="30"
+     name="return_btn"
+     top="263"
+     width="80" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Get Top Colliders..."
+     layout="topleft"
+     left="10"
+     name="top_colliders_btn"
+     tool_tip="List of objects experiencing the most potential collisions"
+     top="313"
+     width="150" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="10"
+     name="top_colliders_help"
+     top_delta="2"
+     width="18" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Get Top Scripts..."
+     layout="topleft"
+     left="10"
+     name="top_scripts_btn"
+     tool_tip="List of objects spending the most time running scripts"
+     top_pad="5"
+     width="150" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="10"
+     name="top_scripts_help"
+     top_delta="2"
+     width="18" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Restart Region"
+     layout="topleft"
+     left="10"
+     name="restart_btn"
+     tool_tip="Give 2 minute countdown and restart region"
+     top_pad="5"
+     width="130" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="10"
+     name="restart_help"
+     top_delta="2"
+     width="18" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Delay Restart"
+     layout="topleft"
+     left="10"
+     name="cancel_restart_btn"
+     tool_tip="Delay region restart by one hour"
+     top_pad="5"
+     width="130" />
+</panel>