diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
commit | 60bceb759b592348b403689ffa8ed9c768126f8b (patch) | |
tree | 33b0ece80cc12f390683d89c30f2a706fa87bd50 /indra/newview/skins/default/xui/en/floater_beacons.xml | |
parent | c9c192e2c476e73807d23cdda0814cb221a96b95 (diff) | |
parent | e2baffa940a5797f2055f13ceb9722de524b2ec3 (diff) |
merge changes for storm-954
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_beacons.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_beacons.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index 4fc2b698d8..3d29356b22 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="225" + height="245" layout="topleft" name="beacons" help_topic="beacons" @@ -12,7 +12,7 @@ width="240"> <panel follows="left|top|right|bottom" - height="200" + height="240" layout="topleft" left="10" name="beacons_panel" @@ -133,6 +133,16 @@ <check_box.commit_callback function="Beacons.UICheck" /> </check_box> + <check_box + control_name="moapbeacon" + height="16" + left="0" + label="Media sources" + layout="topleft" + name="moapbeacon" > + <check_box.commit_callback + function="Beacons.UICheck" /> + </check_box> </panel> </floater> |