diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-16 10:55:31 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 10:55:31 -0400 |
commit | 0c903609d47fbff0b2436c8873b6abb2ce2d5e3c (patch) | |
tree | 1f943f130f616b6e0cf376a3b941c777632eeb7e /indra/newview | |
parent | 557376b95c28379e8e6edf9a73a25929b900784e (diff) | |
parent | b4e1d03584ce0ee740887def2f7204dc3c5733c4 (diff) |
merge changes for storm-1895
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_debug.xml | 2 |
1 files changed, 1 insertions, 1 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 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> |