diff --git a/doc/contributions.txt b/doc/contributions.txt index 18df538d2a9f66e246f1824ae10ed75993369c52..f0b9a4eeccb26406ed4adb5a863353ee9913ebfd 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 455060313497be93cafe3d651a9300c9040b238d..81b2281adbf575ecc6074149cc21bd5dad16fffa 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>