summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt2
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_debug.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 36aa6b36fa..3218624f76 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1235,6 +1235,8 @@ Watty Berkson
Westley Schridde
Westley Streeter
Whimsy Winx
+Whirly Fizzle
+ STORM-1895
Whoops Babii
VWR-631
VWR-1640
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index a4883c21e2..81b2281adb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -198,7 +198,7 @@
layout="topleft"
left_pad="155"
name="cancel_restart_btn"
- tool_tip="Delay region restart by one hour"
+ tool_tip="Cancel region restart"
top_delta="0"
width="150" />
</panel>