summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-02 16:14:53 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-02 16:14:53 +0000
commit210fed642b5fe0d837b9dd84a8988d5f17bbd1c1 (patch)
tree7a0d53814b5955b7256eb33d7c1a6fd3fafb824a /indra/newview/skins/default/xui
parent9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff)
parent0a41542f2388a3b6142a15fef653b3e663e1dcc7 (diff)
PE merge.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_participant_list.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml16
3 files changed, 14 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 60c9810e95..2c9402f6cb 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -46,8 +46,11 @@
<ui_ctrl
height="90"
width="90"
+ layout="topleft"
name="thumbnail_placeholder"
top_pad="6"
+ follows="left|top"
+ left="10"
/>
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 805ffbae66..d03a7e3d41 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -78,6 +78,9 @@
name="Pay">
<menu_item_call.on_click
function="Avatar.Pay" />
+ <menu_item_call.on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_pay" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 27461571da..40b9b56903 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -306,7 +306,7 @@
name="add_friend"
tool_tip="Offer friendship to the Resident"
top="5"
- width="81" />
+ width="80" />
<button
follows="bottom|left"
height="23"
@@ -316,7 +316,7 @@
tool_tip="Open instant message session"
top="5"
left_pad="3"
- width="45" />
+ width="39" />
<button
follows="bottom|left"
height="23"
@@ -326,7 +326,7 @@
tool_tip="Call this Resident"
left_pad="3"
top="5"
- width="46" />
+ width="43" />
<button
enabled="false"
follows="bottom|left"
@@ -337,7 +337,7 @@
tool_tip="Show the Resident on the map"
top="5"
left_pad="3"
- width="46" />
+ width="41" />
<button
follows="bottom|left"
height="23"
@@ -347,8 +347,8 @@
tool_tip="Offer teleport"
left_pad="3"
top="5"
- width="78" />
- <!-- <button
+ width="69" />
+ <button
follows="bottom|right"
height="23"
label="▼"
@@ -357,8 +357,8 @@
tool_tip="Pay money to or share inventory with the Resident"
right="-1"
top="5"
- left_pad="3"
- width="23" />-->
+ left_pad="3"
+ width="23" />
</layout_panel>
<layout_panel
follows="bottom|left"