summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-20 17:52:17 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-20 17:52:17 -0500
commit52c27b99b839cccab09b61c5b02ced2e9df0a04b (patch)
treedec26eba71ecf235519dbb0a4a112ec3a32eaae5 /indra/newview/skins/default
parentac78a7e8b85dff5c896d31ca06315c2e9775c67e (diff)
EXT-829 share button in people panel is inactive
First pass at getting share buttons in the three places we need them: person's profile IM window people panel Only UI changes so far, functionality in a future checkin. Will be reviewed before pushing. --HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml4
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml11
2 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 73d843e6dd..0a5812882d 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -38,12 +38,12 @@
label="Teleport"
name="teleport_btn"
width="100" />
- <!-- <button
+ <button
follows="left|top"
height="20"
label="Share"
name="share_btn"
- width="100" />-->
+ width="100" />
<!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
<!-- <button
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index b8b3d993bd..bb29397ef6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -50,17 +50,6 @@
top="0"
width="60" />
<button
- enabled="true"
- follows="bottom|left"
- font="SansSerifSmall"
- height="25"
- label="Share"
- layout="topleft"
- left_pad="5"
- name="share_btn"
- top="0"
- width="60" />
- <button
enabled="false"
follows="bottom|left"
font="SansSerifSmall"