diff options
4 files changed, 19 insertions, 17 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 693d4c37b8..e85fc32f18 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,6 +576,8 @@ Jonathan Yap STORM-1567 STORM-1572 STORM-1574 + STORM-1579 + STORM-1639 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index c247a12e7a..afb7917043 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -37,7 +37,7 @@ layout="topleft" left="10" tool_tip="Grid opacity" - name="grid_opacity_label" + name="grid_mode_label" top_pad="30" width="123"> Mode diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index 2b2ea78fac..df16f6fd37 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -107,13 +107,13 @@ <text_editor enabled="false" follows="left|top" - height="100" + height="180" layout="topleft" - left="110" + left="10" max_length="65535" name="covenant_editor" - top_delta="30" - width="340" + top_delta="20" + width="460" word_wrap="true"> There is no Covenant provided for this Estate. </text_editor> 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 15df095efa..4550603134 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -174,31 +174,31 @@ <button follows="left|top" height="20" - label="Get Top Scripts..." + label="Restart Region" layout="topleft" - left="10" - name="top_scripts_btn" - tool_tip="List of objects spending the most time running scripts" - top_pad="5" + left_pad="155" + name="restart_btn" + tool_tip="Give 2 minute countdown and restart region" + top_delta="0" width="150" /> <button follows="left|top" height="20" - label="Restart Region" + label="Get Top Scripts..." layout="topleft" left="10" - name="restart_btn" - tool_tip="Give 2 minute countdown and restart region" + name="top_scripts_btn" + tool_tip="List of objects spending the most time running scripts" top_pad="5" - width="130" /> + width="150" /> <button follows="left|top" height="20" label="Delay Restart" layout="topleft" - left="10" + left_pad="155" name="cancel_restart_btn" tool_tip="Delay region restart by one hour" - top_pad="5" - width="130" /> + top_delta="0" + width="150" /> </panel> |