From bfd29121a8e53abb78047764bec5e6b6bdd557f4 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 19 Sep 2014 19:46:34 +0300
Subject: MAINT-4464 FIXED Viewer displays L$ balance of 'L$20' when L$ service
is unavailable
---
indra/newview/skins/default/xui/en/panel_status_bar.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins/default/xui/en')
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 064ece6e4b..dbf7bc031f 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -51,7 +51,7 @@
v_pad="4"
top="0"
wrap="false"
- value="L$20"
+ value="L$??"
width="40" />
<button
halign="center"
--
cgit v1.2.3
From ceeff4fd2b72b095fa96497f4edfb49eb5c6965b Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 19 Sep 2014 20:19:48 +0300
Subject: MAINT-3853 FIXED Add llTeleportAgent Notification to the Notification
List so it can be set to 'never show'
---
indra/newview/skins/default/xui/en/notifications.xml | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'indra/newview/skins/default/xui/en')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ea1bc66236..6cbacdd80c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -34,6 +34,12 @@
</form>
</template>
+ <template name="notifyignore">
+ <form>
+ <ignore text="$ignoretext"/>
+ </form>
+ </template>
+
<template name="okcancelbuttons">
<form>
<button
@@ -9490,6 +9496,9 @@ You have been teleported home by the object '[OBJECT_NAME]'
type="notify">
<tag>fail</tag>
You have been teleported by an attachment on [ITEM_ID]
+ <usetemplate
+ ignoretext="Teleport: You have been teleported by an attachment"
+ name="notifyignore"/>
</notification>
<notification
--
cgit v1.2.3
From 9c4a8951fffb2a649647178f396f01cf68f114fc Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 22 Sep 2014 13:30:11 +0300
Subject: MAINT-4455 FIXED stats - UDP Data should not show any comma
---
indra/newview/skins/default/xui/en/floater_stats.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/newview/skins/default/xui/en')
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index c9a6e1c9c3..a33a7e64a4 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -37,6 +37,7 @@
<stat_bar name="bandwidth"
label="UDP Data Received"
stat="activemessagedatareceived"
+ decimal_digits="0"
show_bar="true"/>
<stat_bar name="packet_loss"
label="Packet Loss"
--
cgit v1.2.3
From 90467f699fba557c6ab1bf42c677bead2adc5aef Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 23 Sep 2014 20:44:59 +0300
Subject: MAINT-3853 Added ignore option for 'teleported by an object on a
parcel' notification
---
indra/newview/skins/default/xui/en/notifications.xml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'indra/newview/skins/default/xui/en')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6cbacdd80c..b4d8046d18 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9507,6 +9507,9 @@ You have been teleported by an attachment on [ITEM_ID]
type="notify">
<tag>fail</tag>
You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+ <usetemplate
+ ignoretext="Teleport: You have been teleported by an object on a parcel"
+ name="notifyignore"/>
</notification>
<notification
--
cgit v1.2.3
From d95feec8dc38dad52f5265a9abc58175019c6d18 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 3 Oct 2014 12:32:58 +0300
Subject: MAINT-4492 FIXED Danish and Polish need to be removed as choices from
Preferences
---
.../skins/default/xui/en/panel_preferences_general.xml | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
(limited to 'indra/newview/skins/default/xui/en')
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index ea0f7d8593..54be1522e9 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -39,12 +39,7 @@
enabled="true"
label="English"
name="English"
- value="en" />
- <combo_box.item
- enabled="true"
- label="Dansk (Danish) - Beta"
- name="Danish"
- value="da" />
+ value="en" />
<combo_box.item
enabled="true"
label="Deutsch (German) - Beta"
@@ -64,12 +59,7 @@
enabled="true"
label="Italiano (Italian) - Beta"
name="Italian"
- value="it" />
- <combo_box.item
- enabled="true"
- label="Polski (Polish) - Beta"
- name="Polish"
- value="pl" />
+ value="it" />
<combo_box.item
enabled="true"
label="Português (Portuguese) - Beta"
--
cgit v1.2.3
From 68e561cf17da0ce32eb16d4999f2315e326f6ee1 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 6 Oct 2014 17:21:27 +0300
Subject: MAINT-3941 Left-clicking on the "Mute when minimized" label doesn't
toggles the display of the check mark
---
indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins/default/xui/en')
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index b71586aab1..615abbaa89 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -398,7 +398,7 @@
follows="left|top"
layout="topleft"
left_delta="-168"
- width="221"
+ width="360"
height="20"
name="ear_location">
<radio_item
--
cgit v1.2.3