From b4e1d03584ce0ee740887def2f7204dc3c5733c4 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Tue, 26 Jun 2012 15:37:31 +0100
Subject: STORM-1895 - Rename Delay Restart button to Cancel Restart
---
doc/contributions.txt | 2 ++
indra/newview/skins/default/xui/en/panel_region_debug.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 18df538d2a..f0b9a4eecc 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1211,6 +1211,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 4550603134..81b2281adb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -194,11 +194,11 @@
<button
follows="left|top"
height="20"
- label="Delay Restart"
+ label="Cancel Restart"
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>
--
cgit v1.2.3