diff options
| author | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-06-18 13:01:46 -0500 | 
|---|---|---|
| committer | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-06-18 13:01:46 -0500 | 
| commit | d8ea11e1b89ad2c2fb2074fa3a29fa76a54b8ce8 (patch) | |
| tree | 66cb9ab50e29fd4d7f813adc1f3439c424ee7582 | |
| parent | 463c0ad32b3273dec64171ae961931dfdd310981 (diff) | |
| parent | 5985ea0f98013741a3313d67cda430152171e611 (diff) | |
simple merge
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_critical.xml | 14 | 
1 files changed, 3 insertions, 11 deletions
| diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 7b5451553f..05c958e051 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -6,6 +6,7 @@   height="500"   layout="topleft"   name="modal container" + open_centered="true"   width="600">      <button       height="20" @@ -16,15 +17,6 @@       name="Continue"       top="465"       width="100" /> -    <button -     height="20" -     label="Cancel" -     label_selected="Cancel" -     layout="topleft" -     left_delta="-468" -     name="Cancel" -     top_delta="0" -     width="100" />      <text       type="string"       length="1" @@ -32,9 +24,9 @@       font="SansSerif"       height="20"       layout="topleft" -     left_delta="4" +     left="20"       name="tos_heading" -     top_delta="-450" +     top="20"       width="552">          Please read the following message carefully.      </text> | 
