merge changes for storm-1895

2012-08-16 10:55:31 -04:00 · 2012-08-16 10:55:31 -04:00 · 0c903609d4
parent 557376b95c b4e1d03584
commit 0c903609d4
2 changed files with 3 additions and 1 deletions
--- 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
--- 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>