FIRE-15048: Drop down menu on Region Restart notice missing in Starlight and Starlight CUI skins (addition for 797741833842 )

Tue, 02 Dec 2014 23:22:10 +0100

author
Northspring <pantera.polnocy@phoenixviewer.com>
date
Tue, 02 Dec 2014 23:22:10 +0100
changeset 43024
af3425b80f59
parent 43023
0f8099ee7944
child 43025
7425b9978a0d

FIRE-15048: Drop down menu on Region Restart notice missing in Starlight and Starlight CUI skins (addition for 797741833842 )

indra/newview/skins/starlight/xui/en/floater_region_restarting.xml file | annotate | diff | revisions
indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/skins/starlight/xui/en/floater_region_restarting.xml	Tue Dec 02 22:11:41 2014 +0100
     1.2 +++ b/indra/newview/skins/starlight/xui/en/floater_region_restarting.xml	Tue Dec 02 23:22:10 2014 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
     1.5  <floater
     1.6 - height="150"
     1.7 + height="200"
     1.8   width="290"
     1.9   layout="topleft"
    1.10   name="region_restarting"
    1.11 @@ -19,9 +19,9 @@
    1.12      </string>
    1.13      <panel
    1.14       name="layout_panel_1"
    1.15 -     height="150"
    1.16 -     width="290"
    1.17 -     follows="right|top"
    1.18 +     right="-1"
    1.19 +     bottom="-1"
    1.20 +     follows="all"
    1.21       top="0"
    1.22       left="0"
    1.23       background_visible="true"
    1.24 @@ -71,5 +71,33 @@
    1.25       Seconds until restart
    1.26       32767
    1.27      </text>
    1.28 +    <combo_box
    1.29 +     allow_text_entry="true"
    1.30 +     follows="top|right"
    1.31 +     height="23"
    1.32 +     label="My Landmarks"
    1.33 +     layout="topleft"
    1.34 +     top_pad="10"
    1.35 +     left="30"
    1.36 +     max_chars="64"
    1.37 +     name="landmark combo"
    1.38 +     right="-50"
    1.39 +     width="182">
    1.40 +        <combo_box.item
    1.41 +         label="My Landmarks"
    1.42 +         name="item1"
    1.43 +         value="None" />
    1.44 +    </combo_box>
    1.45 +    <button
    1.46 +     follows="top|left"
    1.47 +     height="23"
    1.48 +     image_overlay="Arrow_Right"
    1.49 +     image_overlay_alignment="center"
    1.50 +     tool_tip="Teleport to Landmark"
    1.51 +     layout="topleft"
    1.52 +     left_pad="1"
    1.53 +     name="teleport_btn"
    1.54 +     top_delta="0"
    1.55 +     width="28" />
    1.56    </panel>
    1.57   </floater>
     2.1 --- a/indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml	Tue Dec 02 22:11:41 2014 +0100
     2.2 +++ b/indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml	Tue Dec 02 23:22:10 2014 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4  <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
     2.5  <floater
     2.6 - height="150"
     2.7 + height="200"
     2.8   width="290"
     2.9   layout="topleft"
    2.10   name="region_restarting"
    2.11 @@ -19,9 +19,9 @@
    2.12      </string>
    2.13      <panel
    2.14       name="layout_panel_1"
    2.15 -     height="150"
    2.16 -     width="290"
    2.17 -     follows="right|top"
    2.18 +     right="-1"
    2.19 +     bottom="-1"
    2.20 +     follows="all"
    2.21       top="0"
    2.22       left="0"
    2.23       background_visible="true"
    2.24 @@ -71,5 +71,33 @@
    2.25       Seconds until restart
    2.26       32767
    2.27      </text>
    2.28 +    <combo_box
    2.29 +     allow_text_entry="true"
    2.30 +     follows="top|right"
    2.31 +     height="23"
    2.32 +     label="My Landmarks"
    2.33 +     layout="topleft"
    2.34 +     top_pad="10"
    2.35 +     left="30"
    2.36 +     max_chars="64"
    2.37 +     name="landmark combo"
    2.38 +     right="-50"
    2.39 +     width="182">
    2.40 +        <combo_box.item
    2.41 +         label="My Landmarks"
    2.42 +         name="item1"
    2.43 +         value="None" />
    2.44 +    </combo_box>
    2.45 +    <button
    2.46 +     follows="top|left"
    2.47 +     height="23"
    2.48 +     image_overlay="Arrow_Right"
    2.49 +     image_overlay_alignment="center"
    2.50 +     tool_tip="Teleport to Landmark"
    2.51 +     layout="topleft"
    2.52 +     left_pad="1"
    2.53 +     name="teleport_btn"
    2.54 +     top_delta="0"
    2.55 +     width="28" />
    2.56    </panel>
    2.57   </floater>

mercurial