summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-24 00:49:33 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-24 00:49:33 -0800
commit744d23e3145eeca2c8db34b39cd1dc4bec24d3b1 (patch)
tree5d38f05222333ebb019b8d3fe3c6d287b69e13a9 /indra/newview/skins
parent44a6e5da2c76b16bb70a93ba9952bc338dce2e89 (diff)
parent2e47e4f303b9b4d9222cbf6310e0a887468e3109 (diff)
Merge from lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml7
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_colors.xml4
-rw-r--r--indra/newview/skins/default/xui/pl/strings.xml2
4 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9536bf2cf7..60b876d163 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -909,6 +909,13 @@ The new skin will appear after you restart [APP_NAME].
<notification
icon="alertmodal.tga"
+ name="ChangeLanguage"
+ type="alertmodal">
+Changing language will take effect after you restart [APP_NAME].
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="GoToAuctionPage"
type="alertmodal">
Go to the [SECOND_LIFE] web page to see auction details or make a bid?
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 68c423d7dd..6a8bf87bc5 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -241,6 +241,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="25"
layout="topleft"
name="options_gear_btn_panel"
+ user_resize="false"
width="32">
<menu_button
follows="bottom|left"
@@ -261,6 +262,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="25"
layout="topleft"
name="add_btn_panel"
+ user_resize="false"
width="32">
<button
follows="bottom|left"
@@ -281,6 +283,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="25"
layout="topleft"
name="dummy_panel"
+ user_resize="false"
width="212">
<icon
follows="bottom|left|right"
@@ -297,6 +300,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
height="25"
layout="topleft"
name="trash_btn_panel"
+ user_resize="false"
width="31">
<dnd_button
follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 6dc419a96c..0c75399764 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -317,7 +317,7 @@
layout="topleft"
left="30"
height="12"
- name="bubble_chat"
+ name="floater_opacity"
top_pad="15"
width="120"
>
@@ -355,7 +355,7 @@
left="50"
max_val="1.00"
min_val="0.00"
- name="active"
+ name="inactive"
show_text="true"
top_pad="5"
width="415" />
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 59daa26bf0..ea8bdd75b9 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -3469,7 +3469,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Rozmowa głosowa zakończona
</string>
<string name="conference-title-incoming">
- Konferencja z [AGENT_NAME]
+ Konferencja z [AGENT_NAME]
</string>
<string name="no_session_message">
(Sesja IM wygasła)