summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorErica <erica@lindenlab.com>2010-01-22 13:41:21 -0800
committerErica <erica@lindenlab.com>2010-01-22 13:41:21 -0800
commitd32acef62fe2be3d192240cac334bc9df118e58a (patch)
tree1aec7776ad3dfbb6f0349811bd2851200954e361 /indra/newview/skins/default/xui
parentfa891c062ef66410123c66de1ef67b7dcef327db (diff)
parent5d8de7b7200c514bb874e4f60581c6df6cf3be5a (diff)
Automated merge with ssh://hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_checkbox.xml79
1 files changed, 0 insertions, 79 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 042b4226c3..9977e85a9d 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -71,83 +71,4 @@
name="font_checkbox"
top_pad="14"
width="150" />
-
-<chiclet_im_p2p
- height="25"
- name="im_p2p_chiclet"
- show_speaker="false"
- width="25">
- <chiclet_im_p2p.chiclet_button
- height="25"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- name="chiclet_button"
- tab_stop="false"
- width="25"/>
- <chiclet_im_p2p.speaker
- auto_update="true"
- draw_border="false"
- height="25"
- left="25"
- name="speaker"
- visible="false"
- width="20" />
- <chiclet_im_p2p.avatar_icon
- bottom="3"
- follows="left|top|bottom"
- height="20"
- left="2"
- mouse_opaque="false"
- name="avatar_icon"
- width="21" />
- <chiclet_im_p2p.unread_notifications
- height="25"
- font_halign="center"
- left="25"
- mouse_opaque="false"
- name="unread"
- text_color="white"
- v_pad="5"
- visible="false"
- width="20"/>
- <chiclet_im_p2p.new_message_icon
- bottom="11"
- height="14"
- image_name="Unread_Chiclet"
- left="12"
- name="new_message_icon"
- visible="false"
- width="14" />
-</chiclet_im_p2p>
-
-
-<chiclet_offer
- height="25"
- name="offer_chiclet"
- width="25">
- <chiclet_offer.chiclet_button
- height="25"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- name="chiclet_button"
- tab_stop="false"
- width="25"/>
- <chiclet_offer.icon
- bottom="3"
- default_icon="Generic_Object_Small"
- follows="all"
- height="19"
- left="3"
- mouse_opaque="false"
- name="chiclet_icon"
- width="19" />
- <chiclet_offer.new_message_icon
- bottom="11"
- height="14"
- image_name="Unread_Chiclet"
- left="12"
- name="new_message_icon"
- visible="false"
- width="14" />
-</chiclet_offer>
</floater>