diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
commit | 95fcff557f19712e23410a07751f2b571fead8a9 (patch) | |
tree | 1eef32416e5e1c9c60d478ae674b2fe9a35d0c55 /indra/newview/skins/minimal/xui/de/panel_bottomtray.xml | |
parent | 3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff) | |
parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) |
fixed merge conflict in .hgtags
Diffstat (limited to 'indra/newview/skins/minimal/xui/de/panel_bottomtray.xml')
-rw-r--r-- | indra/newview/skins/minimal/xui/de/panel_bottomtray.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml index ea7cccbdf8..a4d80921ec 100644 --- a/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/minimal/xui/de/panel_bottomtray.xml @@ -11,10 +11,10 @@ <bottomtray_button label="Ansicht" name="camera_btn" tool_tip="Kamerasteuerung anzeigen/ausblenden"/> </layout_panel> <layout_panel name="avatar_and_destinations_panel"> - <radio_group name="avatar_and_destination_btns"> - <radio_item name="destination_btn" value="0"/> - <radio_item name="avatar_btn" value="1"/> - </radio_group> + <bottomtray_button label="Ziele" name="destination_btn" tool_tip="Zeigt Leutefenster an"/> + </layout_panel> + <layout_panel name="avatar_and_destinations_panel"> + <bottomtray_button label="Mein Avatar" name="avatar_btn"/> </layout_panel> <layout_panel name="people_panel"> <bottomtray_button label="Leute" name="show_people_button" tool_tip="Zeigt Leutefenster an"/> |