From 891af8055acc66364e7da009c74a6b6a91ea4663 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Tue, 17 Jul 2012 13:52:08 -0700
Subject: MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed
by Kelly
---
indra/newview/skins/default/xui/en/panel_script_ed.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index f6a8af0973..765b07ed8b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -158,6 +158,7 @@
text_readonly_color="DkGray"
width="487"
show_line_numbers="true"
+ enable_tooltip_paste="true"
word_wrap="true">
Loading...
</text_editor>
--
cgit v1.2.3
From 62379fd7628afa5ce1b104ff66b26821ce740c29 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Tue, 31 Jul 2012 10:37:50 -0700
Subject: MAINT-1305 llDialog tooltip typo
---
indra/newview/skins/default/xui/en/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 866ea296c3..1d5163e725 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1446,7 +1446,7 @@ integer llScriptDanger(vector pos)
Returns TRUE if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts
</string>
<string name="LSLTipText_llDialog" translate="false">
-llDialog(key avatar, string message, list buttons, integer chat_channel
+llDialog(key avatar, string message, list buttons, integer chat_channel)
Shows a dialog box on the avatar's screen with a message and up to 12 buttons.
If a button is pressed, the avatar says the text of the button label on chat_channel.
</string>
--
cgit v1.2.3
From 4e96efd42e44197fc33bae3c61871457213f9764 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 16:55:13 +0300
Subject: MAINT-257 FIXED Increase minimum width to avoid overlaping
---
indra/newview/skins/default/xui/en/floater_ui_preview.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 06d4327293..eb01294831 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -5,7 +5,7 @@
height="640"
layout="topleft"
min_height="230"
- min_width="650"
+ min_width="750"
name="gui_preview_tool"
help_topic="gui_preview_tool"
single_instance="true"
--
cgit v1.2.3
From f02ec7b00cdbac7ba8be3baac5a12646a85235b6 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 17:20:59 +0300
Subject: MAINT-1069 FIXED Change "follows" attribute for scroll list to
"left|top|right"
---
indra/newview/skins/default/xui/en/panel_group_roles.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index eea2606125..df91ad8b5e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -254,7 +254,7 @@ things in this group. There's a broad variety of Abilities.
column_padding="0"
draw_stripes="true"
height="200"
- follows="left|top"
+ follows="left|top|right"
layout="topleft"
left="0"
right="-1"
--
cgit v1.2.3
From ff2bb96a55e8869843174be7324b0a59578a4f0d Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 18:26:19 +0300
Subject: MAINT-105 FIXED New function to check People tabs visibility
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 27 ++++++++++++++--------
1 file changed, 18 insertions(+), 9 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..c6d9f9ef8f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -276,30 +276,39 @@
parameter="gestures" />
</menu_item_check>
<menu_item_separator/>
- <menu_item_call
+ <menu_item_check
label="Friends"
name="My Friends"
shortcut="control|shift|F">
- <menu_item_call.on_click
+ <menu_item_check.on_check
+ function="SideTray.CheckPanelPeopleTab"
+ parameter="friends_panel" />
+ <menu_item_check.on_click
function="SideTray.PanelPeopleTab"
parameter="friends_panel" />
- </menu_item_call>
- <menu_item_call
+ </menu_item_check>
+ <menu_item_check
label="Groups"
name="My Groups"
shortcut="control|shift|G">
- <menu_item_call.on_click
+ <menu_item_check.on_check
+ function="SideTray.CheckPanelPeopleTab"
+ parameter="groups_panel" />
+ <menu_item_check.on_click
function="SideTray.PanelPeopleTab"
parameter="groups_panel" />
- </menu_item_call>
- <menu_item_call
+ </menu_item_check>
+ <menu_item_check
label="Nearby people"
name="Active Speakers"
shortcut="control|shift|A">
- <menu_item_call.on_click
+ <menu_item_check.on_check
+ function="SideTray.CheckPanelPeopleTab"
+ parameter="nearby_panel" />
+ <menu_item_check.on_click
function="SideTray.PanelPeopleTab"
parameter="nearby_panel" />
- </menu_item_call>
+ </menu_item_check>
<menu_item_call
label="Block List"
name="Block List">
--
cgit v1.2.3
From 160c6d4d3baa3b7402a1efc1e779d2306ee906a2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 9 Aug 2012 13:45:20 +0300
Subject: MAINT-274 FIXED "media_info" width is decreased to avoid overlaying
---
indra/newview/skins/default/xui/en/floater_tools.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5204efbf65..436e9f8fed 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2994,7 +2994,7 @@ even though the user gets a free copy.
use_ellipses="true"
read_only="true"
name="media_info"
- width="280" />
+ width="180" />
<web_browser
visible="false"
enabled="false"
--
cgit v1.2.3
From 1408a0831bf7c713052e0b73f4c5e8a3deddd9d2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 9 Aug 2012 15:44:10 +0300
Subject: MAINT-913 FIXED Added "Zoom" combobox menu item
---
indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index e9a787cef0..f1ae14809f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -292,6 +292,10 @@
label="Open"
name="Open"
value="Open" />
+ <combo_box.item
+ label="Zoom"
+ name="Zoom"
+ value="Zoom" />
</combo_box>
<panel
border="false"
--
cgit v1.2.3
From 2e1f38695f72020062a09038cc021fff462785bd Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 16 Aug 2012 12:32:39 +0300
Subject: MAINT-915 FIXED Changed max_length to max_length_bytes
---
indra/newview/skins/default/xui/en/panel_media_settings_general.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index cdf14572fe..e844a15118 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -30,7 +30,7 @@
(This page does not pass the specified whitelist)
</text>
<line_editor
- max_length="1024"
+ max_length_bytes="1024"
bottom_delta="-24"
enabled="true"
follows="left|top"
--
cgit v1.2.3
From f93b94daa978e1bcf1897e0459fa8700f58d62d1 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 22 Aug 2012 11:42:44 +0300
Subject: MAINT-56 FIXED collapse_all_folders() and expand_all_folders()
functions are added, which are called by menu items in gear menu.
---
indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index fc7272b904..3b8ace6308 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -194,6 +194,20 @@
<!-- copied from menu_inventory_add.xml -->
<menu_item_separator name="sepatator2" />
+ <menu_item_call
+ label="Expand all folders"
+ layout="topleft"
+ name="expand">
+ <on_click
+ function="Gear.Expand" />
+ </menu_item_call>
+ <menu_item_call
+ label="Collapse all folders"
+ layout="topleft"
+ name="collapse">
+ <on_click
+ function="Gear.Collapse" />
+ </menu_item_call>
<menu_item_call
label="Rename Outfit"
layout="topleft"
--
cgit v1.2.3
From 632618be6540c7e9cc0022f01badda8b989866ed Mon Sep 17 00:00:00 2001
From: MaksymS ProductEngine <msavchenko@productengine.com>
Date: Fri, 24 Aug 2012 01:02:42 +0300
Subject: MAINT-1400 FIXED duplicated IDs in two files: notifications.xml and
floater_texture_ctrl.xml
---
indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | 10 ----------
indra/newview/skins/default/xui/en/notifications.xml | 12 ------------
2 files changed, 22 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 2e29c61cb2..6021ba0a5a 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -134,16 +134,6 @@
top_delta="-25"
name="Pipette"
width="28" />
- <check_box
- follows="left|bottom"
- height="20"
- initial_value="true"
- label="Live Preview"
- layout="topleft"
- left="4"
- name="apply_immediate_check"
- top="262"
- width="120" />
<text
follows="left|bottom"
height="20"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 13f073a1c2..bfb8d61ca6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7569,18 +7569,6 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME]
name="LivePreviewUnavailable"
type="alert">
-We cannot display a preview of this texture because it is no-copy and/or no-transfer.
- <usetemplate
- ignoretext="Warn me that Live Preview mode is not available for no-copy and/or no-transfer textures"
- name="okignore"
- yestext="OK"/>
- </notification>
-
- <notification
- icon="alertmodal.tga"
- name="LivePreviewUnavailable"
- type="alert">
-
We cannot display a preview of this texture because it is no-copy and/or no-transfer.
<usetemplate
ignoretext="Warn me that Live Preview mode is not available for no-copy and/or no-transfer textures"
--
cgit v1.2.3
From 385e229fae99f1e203776799f4cac6f84317d2a6 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 6 Sep 2012 12:22:09 +0300
Subject: MAINT-1183 FIXED Tooltip text is changed
---
indra/newview/skins/default/xui/en/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9d2978b269..63ed6cea7d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3326,7 +3326,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="LocationCtrlAdultIconTooltip">Adult Region</string>
<string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
<string name="LocationCtrlGeneralIconTooltip">General Region</string>
- <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
+ <string name="LocationCtrlSeeAVsTooltip">Avatars inside this parcel cannot be seen or heard by avatars outside this parcel</string>
<string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string>
<string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
<!-- Strings used by the (currently Linux) auto-updater app -->
--
cgit v1.2.3
From cc2afc1914cb4f5df0391e630cc6ab2300b1d841 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 6 Sep 2012 12:24:10 +0300
Subject: MAINT-1440 FIXED Call Tools.TakeCopy instead of
InspectObject.TakeFreeCopy
---
indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 63e154697b..2c420aa1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -57,7 +57,7 @@
layout="topleft"
name="take_copy">
<menu_item_call.on_click
- function="InspectObject.TakeFreeCopy"/>
+ function="Tools.TakeCopy"/>
<menu_item_call.on_visible
function="Tools.EnableTakeCopy"/>
</menu_item_call>
--
cgit v1.2.3
From f015718cffb584fb78579df38aeeefee2aebb801 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Fri, 7 Sep 2012 14:00:00 -0700
Subject: MAINT-1494 : Viewer needs new localizable strings
---
.../newview/skins/default/xui/en/notifications.xml | 534 +++++++++++++++++++++
1 file changed, 534 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8e6de6ed4f..e1f61d77bc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8272,4 +8272,538 @@ Attempt cancelled.
yestext="Yes"/>
</notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarFrozen"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+[AV_FREEZER] has frozen you. You cannot move or interact with the world.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarFrozenDuration"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="YouFrozeAvatar"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Avatar frozen.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarHasUnFrozenYou"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+[AV_FREEZER] has unfrozen you.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarUnFrozen"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Avatar unfrozen.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarFreezeFailure"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Freeze failed because you don't have admin permission for that parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarFreezeThaw"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Your freeze expired, go about your business.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarCantFreeze"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Sorry, can't freeze that user.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NowOwnObject"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME]
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantRezOnLand"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RezFailTooManyRequests"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Object can not be rezzed because there are too many requests.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SitFailCantMove"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You cannot sit because you cannot move at this time.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SitFailNotAllowedOnLand"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You cannot sit because you are not allowed on that land.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SitFailNotSameRegion"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Try moving closer. Xan't sit on object because
+it is not in the same region as you.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoNewObjectRegionFull"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Unable to create new object. The region is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="FailedToPlaceObject"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Failed to place object at specified location. Please try again.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoOwnNoGardening"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You Xan't create trees and grass on land you don't own.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoCopyPermsNoObject"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoTransPermsNoObject"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AddToNavMeshNoCopy"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="DupeWithNoRootsSelected"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Duplicate with no root objects selected.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDupeCuzRegionIsFull"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't duplicate objects because the region is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDupeCuzParcelNotFound"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't duplicate objects - Xan't find the parcel they are on.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateCuzParcelFull"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't create object because
+the parcel is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RezAttemptFailed"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Attempt to rez an object failed.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ToxicInvRezAttemptFailed"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Unable to create item that has caused problems on this region.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="InvItemIsBlacklisted"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+That inventory item has been blacklisted.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoCanRezObjects"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You are not currently allowed to create objects.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LandSearchBlocked"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Land Search Blocked.
+You have performed too many land searches too quickly.
+Please try again in a minute.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NotEnoughResourcesToAttach"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Not enough script resources available to attach object!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="YouDiedAndGotTPHome"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You died and have been teleported to your home location
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="EjectComingSoon"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You are no longer allowed here and have [EJECT_TIME] seconds to leave.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoEnterServerFull"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You Xan't enter this region because
+the server is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SaveBackToInvDisabled"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Save Back To Inventory has been disabled.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoExistNoSaveToContents"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoModNoSaveToContents"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoSaveBackToInvDisabled"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoCopyNoSelCopy"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoTransNoSelCopy"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoTransNoCopy"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermsNoRemoval"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoModNoSaveSelection"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoCopyNoSaveSelection"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoModNoTaking"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RezDestInternalError"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Internal Error: Unknown destination type.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="DeleteFailObjNotFound"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Delete failed because object not found
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SorryCantEjectUser"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Sorry, Xan't eject that user.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RegionSezNotAHome"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+This region does not allow you to set your home location here.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="HomeLocationLimits"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="HomePositionSet"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Home position set.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarEjected"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Avatar ejected.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AvatarEjectFailed"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Eject failed because you don't have admin permission for that parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantMoveObjectParcelFull"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantMoveObjectParcelPerms"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantMoveObjectParcelResources"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantMoveObjectRegionVersion"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantMoveObjectNavMesh"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantMoveObjectWTF"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Xan't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+ </notification>
+
</notifications>
--
cgit v1.2.3
From e10b013e4246cd276d1496ed4acc09edab0c1255 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 10 Sep 2012 18:24:45 +0300
Subject: MAINT-1515 FIXED min_height is increased to avoid overlapping
---
indra/newview/skins/default/xui/en/floater_my_inventory.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index ea44fd493e..178987962b 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
height="570"
help_topic="sidebar_inventory"
min_width="333"
- min_height="560"
+ min_height="570"
name="floater_my_inventory"
save_rect="true"
save_visibility="true"
--
cgit v1.2.3
From 6762162fba886cf5da032f1b30db02bf95703990 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Thu, 20 Sep 2012 11:19:51 -0700
Subject: MAINT-1589 - Update debit permissions dialog (residents deemed
frightening). Removed sentence as per jira. Also removed "persist" tag from
new localized alert strings since they shouldn't persist.
---
.../newview/skins/default/xui/en/notifications.xml | 60 +---------------------
1 file changed, 1 insertion(+), 59 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e1f61d77bc..fc40c7d745 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6764,7 +6764,7 @@ Is this OK?
type="notify">
Warning: The object '<nolink>[OBJECTNAME]</nolink>' wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
-It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account.
+Do not allow access if you do not fully understand why it wants access to your account.
<tag>confirm</tag>
<form name="form">
@@ -8276,7 +8276,6 @@ Attempt cancelled.
<notification
icon="alertmodal.tga"
name="AvatarFrozen"
- persist="true"
type="notify">
<tag>fail</tag>
[AV_FREEZER] has frozen you. You cannot move or interact with the world.
@@ -8285,7 +8284,6 @@ Attempt cancelled.
<notification
icon="alertmodal.tga"
name="AvatarFrozenDuration"
- persist="true"
type="notify">
<tag>fail</tag>
[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
@@ -8294,7 +8292,6 @@ Attempt cancelled.
<notification
icon="alertmodal.tga"
name="YouFrozeAvatar"
- persist="true"
type="notify">
<tag>fail</tag>
Avatar frozen.
@@ -8303,7 +8300,6 @@ Avatar frozen.
<notification
icon="alertmodal.tga"
name="AvatarHasUnFrozenYou"
- persist="true"
type="notify">
<tag>fail</tag>
[AV_FREEZER] has unfrozen you.
@@ -8312,7 +8308,6 @@ Avatar frozen.
<notification
icon="alertmodal.tga"
name="AvatarUnFrozen"
- persist="true"
type="notify">
<tag>fail</tag>
Avatar unfrozen.
@@ -8321,7 +8316,6 @@ Avatar unfrozen.
<notification
icon="alertmodal.tga"
name="AvatarFreezeFailure"
- persist="true"
type="notify">
<tag>fail</tag>
Freeze failed because you don't have admin permission for that parcel.
@@ -8330,7 +8324,6 @@ Freeze failed because you don't have admin permission for that parcel.
<notification
icon="alertmodal.tga"
name="AvatarFreezeThaw"
- persist="true"
type="notify">
<tag>fail</tag>
Your freeze expired, go about your business.
@@ -8339,7 +8332,6 @@ Your freeze expired, go about your business.
<notification
icon="alertmodal.tga"
name="AvatarCantFreeze"
- persist="true"
type="notify">
<tag>fail</tag>
Sorry, can't freeze that user.
@@ -8348,7 +8340,6 @@ Sorry, can't freeze that user.
<notification
icon="alertmodal.tga"
name="NowOwnObject"
- persist="true"
type="notify">
<tag>fail</tag>
You are now the owner of object [OBJECT_NAME]
@@ -8357,7 +8348,6 @@ You are now the owner of object [OBJECT_NAME]
<notification
icon="alertmodal.tga"
name="CantRezOnLand"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership.
@@ -8366,7 +8356,6 @@ Xan't rez object at [OBJECT_POS] because the owner of this land does not allow i
<notification
icon="alertmodal.tga"
name="RezFailTooManyRequests"
- persist="true"
type="notify">
<tag>fail</tag>
Object can not be rezzed because there are too many requests.
@@ -8375,7 +8364,6 @@ Object can not be rezzed because there are too many requests.
<notification
icon="alertmodal.tga"
name="SitFailCantMove"
- persist="true"
type="notify">
<tag>fail</tag>
You cannot sit because you cannot move at this time.
@@ -8384,7 +8372,6 @@ You cannot sit because you cannot move at this time.
<notification
icon="alertmodal.tga"
name="SitFailNotAllowedOnLand"
- persist="true"
type="notify">
<tag>fail</tag>
You cannot sit because you are not allowed on that land.
@@ -8393,7 +8380,6 @@ You cannot sit because you are not allowed on that land.
<notification
icon="alertmodal.tga"
name="SitFailNotSameRegion"
- persist="true"
type="notify">
<tag>fail</tag>
Try moving closer. Xan't sit on object because
@@ -8403,7 +8389,6 @@ it is not in the same region as you.
<notification
icon="alertmodal.tga"
name="NoNewObjectRegionFull"
- persist="true"
type="notify">
<tag>fail</tag>
Unable to create new object. The region is full.
@@ -8412,7 +8397,6 @@ Unable to create new object. The region is full.
<notification
icon="alertmodal.tga"
name="FailedToPlaceObject"
- persist="true"
type="notify">
<tag>fail</tag>
Failed to place object at specified location. Please try again.
@@ -8421,7 +8405,6 @@ Failed to place object at specified location. Please try again.
<notification
icon="alertmodal.tga"
name="NoOwnNoGardening"
- persist="true"
type="notify">
<tag>fail</tag>
You Xan't create trees and grass on land you don't own.
@@ -8430,7 +8413,6 @@ You Xan't create trees and grass on land you don't own.
<notification
icon="alertmodal.tga"
name="NoCopyPermsNoObject"
- persist="true"
type="notify">
<tag>fail</tag>
Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
@@ -8439,7 +8421,6 @@ Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
<notification
icon="alertmodal.tga"
name="NoTransPermsNoObject"
- persist="true"
type="notify">
<tag>fail</tag>
Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
@@ -8448,7 +8429,6 @@ Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
<notification
icon="alertmodal.tga"
name="AddToNavMeshNoCopy"
- persist="true"
type="notify">
<tag>fail</tag>
Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
@@ -8457,7 +8437,6 @@ Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
<notification
icon="alertmodal.tga"
name="DupeWithNoRootsSelected"
- persist="true"
type="notify">
<tag>fail</tag>
Duplicate with no root objects selected.
@@ -8466,7 +8445,6 @@ Duplicate with no root objects selected.
<notification
icon="alertmodal.tga"
name="CantDupeCuzRegionIsFull"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't duplicate objects because the region is full.
@@ -8475,7 +8453,6 @@ Xan't duplicate objects because the region is full.
<notification
icon="alertmodal.tga"
name="CantDupeCuzParcelNotFound"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't duplicate objects - Xan't find the parcel they are on.
@@ -8484,7 +8461,6 @@ Xan't duplicate objects - Xan't find the parcel they are on.
<notification
icon="alertmodal.tga"
name="CantCreateCuzParcelFull"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't create object because
@@ -8494,7 +8470,6 @@ the parcel is full.
<notification
icon="alertmodal.tga"
name="RezAttemptFailed"
- persist="true"
type="notify">
<tag>fail</tag>
Attempt to rez an object failed.
@@ -8503,7 +8478,6 @@ Attempt to rez an object failed.
<notification
icon="alertmodal.tga"
name="ToxicInvRezAttemptFailed"
- persist="true"
type="notify">
<tag>fail</tag>
Unable to create item that has caused problems on this region.
@@ -8512,7 +8486,6 @@ Unable to create item that has caused problems on this region.
<notification
icon="alertmodal.tga"
name="InvItemIsBlacklisted"
- persist="true"
type="notify">
<tag>fail</tag>
That inventory item has been blacklisted.
@@ -8521,7 +8494,6 @@ That inventory item has been blacklisted.
<notification
icon="alertmodal.tga"
name="NoCanRezObjects"
- persist="true"
type="notify">
<tag>fail</tag>
You are not currently allowed to create objects.
@@ -8530,7 +8502,6 @@ You are not currently allowed to create objects.
<notification
icon="alertmodal.tga"
name="LandSearchBlocked"
- persist="true"
type="notify">
<tag>fail</tag>
Land Search Blocked.
@@ -8541,7 +8512,6 @@ Please try again in a minute.
<notification
icon="alertmodal.tga"
name="NotEnoughResourcesToAttach"
- persist="true"
type="notify">
<tag>fail</tag>
Not enough script resources available to attach object!
@@ -8550,7 +8520,6 @@ Not enough script resources available to attach object!
<notification
icon="alertmodal.tga"
name="YouDiedAndGotTPHome"
- persist="true"
type="notify">
<tag>fail</tag>
You died and have been teleported to your home location
@@ -8559,7 +8528,6 @@ You died and have been teleported to your home location
<notification
icon="alertmodal.tga"
name="EjectComingSoon"
- persist="true"
type="notify">
<tag>fail</tag>
You are no longer allowed here and have [EJECT_TIME] seconds to leave.
@@ -8568,7 +8536,6 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave.
<notification
icon="alertmodal.tga"
name="NoEnterServerFull"
- persist="true"
type="notify">
<tag>fail</tag>
You Xan't enter this region because
@@ -8578,7 +8545,6 @@ the server is full.
<notification
icon="alertmodal.tga"
name="SaveBackToInvDisabled"
- persist="true"
type="notify">
<tag>fail</tag>
Save Back To Inventory has been disabled.
@@ -8587,7 +8553,6 @@ Save Back To Inventory has been disabled.
<notification
icon="alertmodal.tga"
name="NoExistNoSaveToContents"
- persist="true"
type="notify">
<tag>fail</tag>
Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
@@ -8596,7 +8561,6 @@ Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed fro
<notification
icon="alertmodal.tga"
name="NoModNoSaveToContents"
- persist="true"
type="notify">
<tag>fail</tag>
Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
@@ -8605,7 +8569,6 @@ Cannot save '[OBJ_NAME]' to object contents because you do not have permission t
<notification
icon="alertmodal.tga"
name="NoSaveBackToInvDisabled"
- persist="true"
type="notify">
<tag>fail</tag>
Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
@@ -8614,7 +8577,6 @@ Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
<notification
icon="alertmodal.tga"
name="NoCopyNoSelCopy"
- persist="true"
type="notify">
<tag>fail</tag>
You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
@@ -8623,7 +8585,6 @@ You cannot copy your selection because you do not have permission to copy the ob
<notification
icon="alertmodal.tga"
name="NoTransNoSelCopy"
- persist="true"
type="notify">
<tag>fail</tag>
You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
@@ -8632,7 +8593,6 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
<notification
icon="alertmodal.tga"
name="NoTransNoCopy"
- persist="true"
type="notify">
<tag>fail</tag>
You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
@@ -8641,7 +8601,6 @@ You cannot copy your selection because the object '[OBJ_NAME]' is not transferra
<notification
icon="alertmodal.tga"
name="NoPermsNoRemoval"
- persist="true"
type="notify">
<tag>fail</tag>
Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
@@ -8650,7 +8609,6 @@ Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permi
<notification
icon="alertmodal.tga"
name="NoModNoSaveSelection"
- persist="true"
type="notify">
<tag>fail</tag>
Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
@@ -8659,7 +8617,6 @@ Cannot save your selection because you do not have permission to modify the obje
<notification
icon="alertmodal.tga"
name="NoCopyNoSaveSelection"
- persist="true"
type="notify">
<tag>fail</tag>
Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
@@ -8668,7 +8625,6 @@ Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
<notification
icon="alertmodal.tga"
name="NoModNoTaking"
- persist="true"
type="notify">
<tag>fail</tag>
You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
@@ -8677,7 +8633,6 @@ You cannot take your selection because you do not have permission to modify the
<notification
icon="alertmodal.tga"
name="RezDestInternalError"
- persist="true"
type="notify">
<tag>fail</tag>
Internal Error: Unknown destination type.
@@ -8686,7 +8641,6 @@ Internal Error: Unknown destination type.
<notification
icon="alertmodal.tga"
name="DeleteFailObjNotFound"
- persist="true"
type="notify">
<tag>fail</tag>
Delete failed because object not found
@@ -8695,7 +8649,6 @@ Delete failed because object not found
<notification
icon="alertmodal.tga"
name="SorryCantEjectUser"
- persist="true"
type="notify">
<tag>fail</tag>
Sorry, Xan't eject that user.
@@ -8704,7 +8657,6 @@ Sorry, Xan't eject that user.
<notification
icon="alertmodal.tga"
name="RegionSezNotAHome"
- persist="true"
type="notify">
<tag>fail</tag>
This region does not allow you to set your home location here.
@@ -8713,7 +8665,6 @@ This region does not allow you to set your home location here.
<notification
icon="alertmodal.tga"
name="HomeLocationLimits"
- persist="true"
type="notify">
<tag>fail</tag>
You can only set your 'Home Location' on your land or at a mainland Infohub.
@@ -8722,7 +8673,6 @@ You can only set your 'Home Location' on your land or at a mainland Infohub.
<notification
icon="alertmodal.tga"
name="HomePositionSet"
- persist="true"
type="notify">
<tag>fail</tag>
Home position set.
@@ -8731,7 +8681,6 @@ Home position set.
<notification
icon="alertmodal.tga"
name="AvatarEjected"
- persist="true"
type="notify">
<tag>fail</tag>
Avatar ejected.
@@ -8740,7 +8689,6 @@ Avatar ejected.
<notification
icon="alertmodal.tga"
name="AvatarEjectFailed"
- persist="true"
type="notify">
<tag>fail</tag>
Eject failed because you don't have admin permission for that parcel.
@@ -8749,7 +8697,6 @@ Eject failed because you don't have admin permission for that parcel.
<notification
icon="alertmodal.tga"
name="CantMoveObjectParcelFull"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't move object '[OBJECT_NAME]' to
@@ -8759,7 +8706,6 @@ Xan't move object '[OBJECT_NAME]' to
<notification
icon="alertmodal.tga"
name="CantMoveObjectParcelPerms"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't move object '[OBJECT_NAME]' to
@@ -8769,7 +8715,6 @@ Xan't move object '[OBJECT_NAME]' to
<notification
icon="alertmodal.tga"
name="CantMoveObjectParcelResources"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't move object '[OBJECT_NAME]' to
@@ -8779,7 +8724,6 @@ Xan't move object '[OBJECT_NAME]' to
<notification
icon="alertmodal.tga"
name="CantMoveObjectRegionVersion"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't move object '[OBJECT_NAME]' to
@@ -8789,7 +8733,6 @@ Xan't move object '[OBJECT_NAME]' to
<notification
icon="alertmodal.tga"
name="CantMoveObjectNavMesh"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't move object '[OBJECT_NAME]' to
@@ -8799,7 +8742,6 @@ Xan't move object '[OBJECT_NAME]' to
<notification
icon="alertmodal.tga"
name="CantMoveObjectWTF"
- persist="true"
type="notify">
<tag>fail</tag>
Xan't move object '[OBJECT_NAME]' to
--
cgit v1.2.3
From dcd9831a1c9a58233f19c9b4f0e66a67faafb8a4 Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Thu, 20 Sep 2012 22:38:12 +0000
Subject: [MAINT-1562] Convert more hard-coded alert messages to be localized
Related chagesets:
http://hg.lindenlab.com/baker/honeybadger/changeset/74c398c712b6
Description:
- Updated english notifications.xml with alerts from the related changeset above.
---
.../newview/skins/default/xui/en/notifications.xml | 1117 +++++++++++++++++++-
1 file changed, 1111 insertions(+), 6 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fc40c7d745..eb901130d3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8699,7 +8699,7 @@ Eject failed because you don't have admin permission for that parcel.
name="CantMoveObjectParcelFull"
type="notify">
<tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
</notification>
@@ -8708,7 +8708,7 @@ Xan't move object '[OBJECT_NAME]' to
name="CantMoveObjectParcelPerms"
type="notify">
<tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
</notification>
@@ -8717,7 +8717,7 @@ Xan't move object '[OBJECT_NAME]' to
name="CantMoveObjectParcelResources"
type="notify">
<tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
</notification>
@@ -8726,7 +8726,7 @@ Xan't move object '[OBJECT_NAME]' to
name="CantMoveObjectRegionVersion"
type="notify">
<tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
</notification>
@@ -8735,7 +8735,7 @@ Xan't move object '[OBJECT_NAME]' to
name="CantMoveObjectNavMesh"
type="notify">
<tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
</notification>
@@ -8744,8 +8744,1113 @@ Xan't move object '[OBJECT_NAME]' to
name="CantMoveObjectWTF"
type="notify">
<tag>fail</tag>
-Xan't move object '[OBJECT_NAME]' to
+Can't move object '[OBJECT_NAME]' to
[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="PermModifyObject"
+ type="notify">
+ <tag>fail</tag>
+You don't have permission to modify that object
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="PhantomWithConcavePiece"
+ type="notify">
+ <tag>fail</tag>
+This object cannot have a concave piece because it is phantom and contributes to the navmesh.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableAddItem"
+ type="notify">
+ <tag>fail</tag>
+Unable to add item!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableEditItem"
+ type="notify">
+ <tag>fail</tag>
+Unable to edit this!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermToEdit"
+ type="notify">
+ <tag>fail</tag>
+Not permitted to edit this.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermToCopyInventory"
+ type="notify">
+ <tag>fail</tag>
+Not permitted to copy that inventory.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSaveItemDoesntExist"
+ type="notify">
+ <tag>fail</tag>
+Cannot save to object contents: Item no longer exists.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSaveItemAlreadyExists"
+ type="notify">
+ <tag>fail</tag>
+Cannot save to object contents: Item with that name already exists in inventory
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSaveModifyAttachment"
+ type="notify">
+ <tag>fail</tag>
+Cannot save to object contents: This would modify the attachment permissions.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermToEdit"
+ type="notify">
+ <tag>fail</tag>
+Not permitted to edit this!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TooManyScripts"
+ type="notify">
+ <tag>fail</tag>
+Too many scripts.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableAddScript"
+ type="notify">
+ <tag>fail</tag>
+Unable to add script!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AssetServerTimeoutObjReturn"
+ type="notify">
+ <tag>fail</tag>
+Asset server didn't respond in a timely fashion. Object returned to sim.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RegionDisablePhysicsShapes"
+ type="notify">
+ <tag>fail</tag>
+This region does not have physics shapes enabled.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoModNavmeshAcrossRegions"
+ type="notify">
+ <tag>fail</tag>
+You cannot modify the navmesh across region boundaries.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermModifyObject"
+ type="notify">
+ <tag>fail</tag>
+You don't have permission to modify that object.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoSetPhysicsPropertiesOnObjectType"
+ type="notify">
+ <tag>fail</tag>
+Cannot set physics properties on that object type.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoSetRootPrimWithNoShape"
+ type="notify">
+ <tag>fail</tag>
+Cannot set root prim to have no shape.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoRegionSupportPhysMats"
+ type="notify">
+ <tag>fail</tag>
+This region does not have physics materials enabled.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="OnlyRootPrimPhysMats"
+ type="notify">
+ <tag>fail</tag>
+Only root prims may have their physics materials adjusted.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoSupportCharacterPhysMats"
+ type="notify">
+ <tag>fail</tag>
+Setting physics materials on characters is not yet supported.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="InvalidPhysMatProperty"
+ type="notify">
+ <tag>fail</tag>
+One or more of the specified physics material properties was invalid.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermsAlterStitchingMeshObj"
+ type="notify">
+ <tag>fail</tag>
+You may not alter the stitching type of a mesh object.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPermsAlterShapeMeshObj"
+ type="notify">
+ <tag>fail</tag>
+You may not alter the shape of a mesh object
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="FullRegionCantEnter"
+ type="notify">
+ <tag>fail</tag>
+You can't enter this region because \nthe region is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedOwnersDiffer"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- owners differ
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedNoModNavmeshAcrossRegions"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- cannot modify the navmesh across region boundaries.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedNoPermToEdit"
+ type="notify">
+ <tag>fail</tag>
+Link failed because you do not have edit permission.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedTooManyPrims"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- too many primitives
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedCantLinkNoCopyNoTrans"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- cannot link no-copy with no-transfer
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedNothingLinkable"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- nothing linkable.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedTooManyPathfindingChars"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- too many pathfinding characters
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedInsufficientLand"
+ type="notify">
+ <tag>fail</tag>
+Link failed -- insufficient land resources
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LinkFailedTooMuchPhysics"
+ type="notify">
+ <tag>fail</tag>
+Object uses too many physics resources -- its dynamics have been disabled.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TeleportAgentByObjectWithParcelInfo"
+ type="notify">
+ <tag>fail</tag>
+You have been teleported home by the object ... on the parcel ...
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TeleportAgentByObject"
+ type="notify">
+ <tag>fail</tag>
+You have been teleported home by the object ... on the parcel ...
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateObjectRegionFull"
+ type="notify">
+ <tag>fail</tag>
+Unable to create requested object. The region is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttackMultipleObjOneSpot"
+ type="notify">
+ <tag>fail</tag>
+You can't attach multiple objects to one spot.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateMultipleObjAtLoc"
+ type="notify">
+ <tag>fail</tag>
+You can't create multiple objects here.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableToCreateObjTimeOut"
+ type="notify">
+ <tag>fail</tag>
+Unable to create requested object. Object is missing from database.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableToCreateObjUnknown"
+ type="notify">
+ <tag>fail</tag>
+Unable to create requested object. The request timed out. Please try again.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableToCreateObjMissingFromDB"
+ type="notify">
+ <tag>fail</tag>
+Unable to create requested object. Please try again.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RezFailureTookTooLong"
+ type="notify">
+ <tag>fail</tag>
+Rez failed, requested object took too long to load.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="FailedToPlaceObjAtLoc"
+ type="notify">
+ <tag>fail</tag>
+Failed to place object at specified location. Please try again.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreatePlantsOnLand"
+ type="notify">
+ <tag>fail</tag>
+You cannot create plants on this land.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantRestoreObjectNoWorldPos"
+ type="notify">
+ <tag>fail</tag>
+Cannot restore object. No world position found.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantRezObjectInvalidMeshData"
+ type="notify">
+ <tag>fail</tag>
+Unable to rez object because its mesh data is invalid.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantRezObjectTooManyScripts"
+ type="notify">
+ <tag>fail</tag>
+Unable to rez object because there are already too many scripts in this region.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateObjectNoAccess"
+ type="notify">
+ <tag>fail</tag>
+Your access privileges don't allow you to create objects there.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateObject"
+ type="notify">
+ <tag>fail</tag>
+You are not currently allowed to create objects.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="InvalidObjectParams"
+ type="notify">
+ <tag>fail</tag>
+Invalid object parameters
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDuplicateObjectNoAcess"
+ type="notify">
+ <tag>fail</tag>
+Your access privileges don't allow you to duplicate objects here.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantChangeShape"
+ type="notify">
+ <tag>fail</tag>
+You are not allowed to change this shape.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoAccessToClaimObjects"
+ type="notify">
+ <tag>fail</tag>
+Your access privileges don't allow you to claim objects here.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="DeedFailedNoPermToDeedForGroup"
+ type="notify">
+ <tag>fail</tag>
+Deed failed because you do not have permission to deed objects for your group.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NoPrivsToBuyObject"
+ type="notify">
+ <tag>fail</tag>
+Your access privileges don't allow you to buy objects here.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttachObjectAvatarSittingOnIt"
+ type="notify">
+ <tag>fail</tag>
+Cannot attach object because an avatar is sitting on it.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="WhyAreYouTryingToWearShrubbery"
+ type="notify">
+ <tag>fail</tag>
+Trees and grasses cannot be worn as attachments.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttachGroupOwnedObjs"
+ type="notify">
+ <tag>fail</tag>
+Cannot attach group-owned objects.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttachObjectsNotOwned"
+ type="notify">
+ <tag>fail</tag>
+Cannot attach objects that you don't own.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttachNavmeshObjects"
+ type="notify">
+ <tag>fail</tag>
+Cannot attach objects that contribute to navmesh.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttachObjectNoMovePermissions"
+ type="notify">
+ <tag>fail</tag>
+Cannot attach object because you do not have permission to move it.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantAttachNotEnoughScriptResources"
+ type="notify">
+ <tag>fail</tag>
+Not enough script resources available to attach object!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDropItemTrialUser"
+ type="notify">
+ <tag>fail</tag>
+You can't drop objects here; try the Free Trial area.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDropMeshAttachment"
+ type="notify">
+ <tag>fail</tag>
+You can't drop mesh attachments. Detach to inventory and then rez in world.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDropAttachmentNoPermission"
+ type="notify">
+ <tag>fail</tag>
+Failed to drop attachment: you don't have permission to drop there.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDropAttachmentInsufficientLandResources"
+ type="notify">
+ <tag>fail</tag>
+Failed to drop attachment: insufficient available land resource.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDropAttachmentInsufficientResources"
+ type="notify">
+ <tag>fail</tag>
+Failed to drop attachments: insufficient available resources.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDropObjectFullParcel"
+ type="notify">
+ <tag>fail</tag>
+Cannot drop object here. Parcel is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantTouchObjectBannedFromParcel"
+ type="notify">
+ <tag>fail</tag>
+Can't touch/grab this object because you are banned from the land parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="PlzNarrowDeleteParams"
+ type="notify">
+ <tag>fail</tag>
+Please narrow your delete parameters.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UnableToUploadAsset"
+ type="notify">
+ <tag>fail</tag>
+Unable to upload asset.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantTeleportCouldNotFindUser"
+ type="notify">
+ <tag>fail</tag>
+Could not find user to teleport home
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GodlikeRequestFailed"
+ type="notify">
+ <tag>fail</tag>
+godlike request failed
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GenericRequestFailed"
+ type="notify">
+ <tag>fail</tag>
+generic request failed
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantUploadPostcard"
+ type="notify">
+ <tag>fail</tag>
+Unable to upload postcard. Try again later.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantFetchInventoryForGroupNotice"
+ type="notify">
+ <tag>fail</tag>
+Unable to fetch inventory details for the group notice.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSendGroupNoticeNotPermitted"
+ type="notify">
+ <tag>fail</tag>
+Unable to send group notice -- not permitted.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSendGroupNoticeCantConstructInventory"
+ type="notify">
+ <tag>fail</tag>
+Unable to send group notice -- could not construct inventory.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantParceInventoryInNotice"
+ type="notify">
+ <tag>fail</tag>
+Unable to parse inventory in notice.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TerrainUploadFailed"
+ type="notify">
+ <tag>fail</tag>
+Terrain upload failed.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TerrainFileWritten"
+ type="notify">
+ <tag>fail</tag>
+Terrain file written.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TerrainFileWrittenStartingDownload"
+ type="notify">
+ <tag>fail</tag>
+Terrain file written, starting download...
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TerrainBaked"
+ type="notify">
+ <tag>fail</tag>
+Terrain baked.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TenObjectsDisabledPlzRefresh"
+ type="notify">
+ <tag>fail</tag>
+Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="UpdateViewerBuyParcel"
+ type="notify">
+ <tag>fail</tag>
+You need to update your viewer to buy this parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LandBuyAccessBlocked"
+ type="notify">
+ <tag>fail</tag>
+You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantBuyParcelNotForSale"
+ type="notify">
+ <tag>fail</tag>
+Unable to buy, this parcel is not for sale.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantBuySalePriceOrLandAreaChanged"
+ type="notify">
+ <tag>fail</tag>
+Unable to buy, the sale price or land area has changed.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantBuyParcelNotAuthorized"
+ type="notify">
+ <tag>fail</tag>
+You are not the authorized buyer for this parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantBuyParcelAwaitingPurchaseAuth"
+ type="notify">
+ <tag>fail</tag>
+You cannot purchase this parcel because it is already awaiting purchase aut
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantBuildOverflowParcel"
+ type="notify">
+ <tag>fail</tag>
+You cannot build objects here because doing so would overflow the parcel.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SelectedMultipleOwnedLand"
+ type="notify">
+ <tag>fail</tag>
+You selected land with different owners. Please select a smaller area and try again.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantJoinTooFewLeasedParcels"
+ type="notify">
+ <tag>fail</tag>
+Not enough leased parcels in selection to join.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDivideLandMultipleParcelsSelected"
+ type="notify">
+ <tag>fail</tag>
+Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDivideLandCantFindParcel"
+ type="notify">
+ <tag>fail</tag>
+Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDivideLandWholeParcelSelected"
+ type="notify">
+ <tag>fail</tag>
+Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LandHasBeenDivided"
+ type="notify">
+ <tag>fail</tag>
+Land has been divided.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="PassPurchased"
+ type="notify">
+ <tag>fail</tag>
+You purchased a pass.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RegionDisallowsClassifieds"
+ type="notify">
+ <tag>fail</tag>
+Region does not allow classified advertisements.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LandPassExpireSoon"
+ type="notify">
+ <tag>fail</tag>
+Your pass to this land is about to expire.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSitNoSuitableSurface"
+ type="notify">
+ <tag>fail</tag>
+There is no suitable surface to sit on, try another spot.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSitNoRoom"
+ type="notify">
+ <tag>fail</tag>
+No room to sit here, try another spot.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AutopilotCanceled"
+ type="notify">
+ <tag>fail</tag>
+Autopilot canceled
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ClaimObjectFailedNoPermission"
+ type="notify">
+ <tag>fail</tag>
+Claim object failed because you don't have permission
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ClaimObjectFailedNoMoney"
+ type="notify">
+ <tag>fail</tag>
+Claim object failed because you don't have enough L$.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDeedGroupLand"
+ type="notify">
+ <tag>fail</tag>
+Cannot deed group-owned land.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="BuyObjectFailedNoMoney"
+ type="notify">
+ <tag>fail</tag>
+Buy object failed because you don't have enough L$.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="BuyInventoryFailedNoMoney"
+ type="notify">
+ <tag>fail</tag>
+Buy inventory failed because you do not have enough L$
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="BuyPassFailedNoMoney"
+ type="notify">
+ <tag>fail</tag>
+You don't have enough L$ to buy a pass to this land.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantBuyPassTryAgain"
+ type="notify">
+ <tag>fail</tag>
+Unable to buy pass right now. Try again later.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateObjectParcelFull"
+ type="notify">
+ <tag>fail</tag>
+Can't create object because \nthe parcel is full.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="FailedPlacingObject"
+ type="notify">
+ <tag>fail</tag>
+Failed to place object at specified location. Please try again.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateLandmarkForEvent"
+ type="notify">
+ <tag>fail</tag>
+Unable to create landmark for event.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="GodBeatsFreeze"
+ type="notify">
+ <tag>fail</tag>
+Your godlike powers break the freeze!
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SpecialPowersRequestFailedLogged"
+ type="notify">
+ <tag>fail</tag>
+Request for special powers failed. This request has been logged.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ExpireExplanation"
+ type="notify">
+ <tag>fail</tag>
+The system is currently unable to process your request. The request timed out.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="DieExplanation"
+ type="notify">
+ <tag>fail</tag>
+The system is unable to process your request.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="AddPrimitiveFailure"
+ type="notify">
+ <tag>fail</tag>
+Insufficient funds to create primitve.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="RezObjectFailure"
+ type="notify">
+ <tag>fail</tag>
+Insufficient funds to create object.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ResetHomePositionNotLegal"
+ type="notify">
+ <tag>fail</tag>
+Reset Home position since Home wasn't legal.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantInviteRegionFull"
+ type="notify">
+ <tag>fail</tag>
+You cannot currently invite anyone to your location because the region is full. Try again later.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantSetHomeAtRegion"
+ type="notify">
+ <tag>fail</tag>
+This region does not allow you to set your home location here.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="ListValidHomeLocations"
+ type="notify">
+ <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="SetHomePosition"
+ type="notify">
+ <tag>fail</tag>
+Home position set.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDerezInventoryError"
+ type="notify">
+ <tag>fail</tag>
+Cannot derez object due to inventory fault.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateRequestedInv"
+ type="notify">
+ <tag>fail</tag>
+Cannot create requested inventory.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateRequestedInvFolder"
+ type="notify">
+ <tag>fail</tag>
+Cannot create requested inventory folder.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateInventory"
+ type="notify">
+ <tag>fail</tag>
+Cannot create that inventory.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateLandmark"
+ type="notify">
+ <tag>fail</tag>
+Cannot create landmark.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantCreateOutfit"
+ type="notify">
+ <tag>fail</tag>
+Cannot create outfit right now. Try again in a minute.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="InventoryNotForSale"
+ type="notify">
+ <tag>fail</tag>
+Inventory is not for sale.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantFindInvItem"
+ type="notify">
+ <tag>fail</tag>
+Unable to find inventory item.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantFindObject"
+ type="notify">
+ <tag>fail</tag>
+Unable to find object.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantTransfterMoneyRegionDisabled"
+ type="notify">
+ <tag>fail</tag>
+Money transfers to objects are currently disabled in this region.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantPayNoAgent"
+ type="notify">
+ <tag>fail</tag>
+Could not figure out who to pay.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantDonateToPublicObjects"
+ type="notify">
+ <tag>fail</tag>
+You cannot give L$ to public objects.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="InventoryCreationInWorldObjectFailed"
+ type="notify">
+ <tag>fail</tag>
+Inventory creation on in-world object failed.
+ </notification>
+
+
</notifications>
--
cgit v1.2.3
From 9ddfb75551056dc9c02815877fbbb00d8c9be8ca Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Thu, 20 Sep 2012 16:23:45 -0700
Subject: Fix up messages altered for testing
---
indra/newview/skins/default/xui/en/notifications.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index eb901130d3..7a03239d0c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8350,7 +8350,7 @@ You are now the owner of object [OBJECT_NAME]
name="CantRezOnLand"
type="notify">
<tag>fail</tag>
-Xan't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership.
+Can't rez object at [OBJECT_POS] because the owner of this land does not allow it. Use the land tool to see land ownership.
</notification>
<notification
@@ -8382,7 +8382,7 @@ You cannot sit because you are not allowed on that land.
name="SitFailNotSameRegion"
type="notify">
<tag>fail</tag>
-Try moving closer. Xan't sit on object because
+Try moving closer. Can't sit on object because
it is not in the same region as you.
</notification>
@@ -8407,7 +8407,7 @@ Failed to place object at specified location. Please try again.
name="NoOwnNoGardening"
type="notify">
<tag>fail</tag>
-You Xan't create trees and grass on land you don't own.
+You Can't create trees and grass on land you don't own.
</notification>
<notification
@@ -8447,7 +8447,7 @@ Duplicate with no root objects selected.
name="CantDupeCuzRegionIsFull"
type="notify">
<tag>fail</tag>
-Xan't duplicate objects because the region is full.
+Can't duplicate objects because the region is full.
</notification>
<notification
@@ -8455,7 +8455,7 @@ Xan't duplicate objects because the region is full.
name="CantDupeCuzParcelNotFound"
type="notify">
<tag>fail</tag>
-Xan't duplicate objects - Xan't find the parcel they are on.
+Can't duplicate objects - Can't find the parcel they are on.
</notification>
<notification
@@ -8463,7 +8463,7 @@ Xan't duplicate objects - Xan't find the parcel they are on.
name="CantCreateCuzParcelFull"
type="notify">
<tag>fail</tag>
-Xan't create object because
+Can't create object because
the parcel is full.
</notification>
@@ -8538,7 +8538,7 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave.
name="NoEnterServerFull"
type="notify">
<tag>fail</tag>
-You Xan't enter this region because
+You can't enter this region because
the server is full.
</notification>
@@ -8651,7 +8651,7 @@ Delete failed because object not found
name="SorryCantEjectUser"
type="notify">
<tag>fail</tag>
-Sorry, Xan't eject that user.
+Sorry, can't eject that user.
</notification>
<notification
--
cgit v1.2.3
From cc342c1afc4a63caaffdfc6397d0c237e90d6194 Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Mon, 24 Sep 2012 18:04:10 +0000
Subject: Converted more hard-coded strings
---
.../newview/skins/default/xui/en/notifications.xml | 118 ++++++++++++++++++++-
1 file changed, 113 insertions(+), 5 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7a03239d0c..8c3cdccbdb 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8750,12 +8750,45 @@ Can't move object '[OBJECT_NAME]' to
<notification
icon="alertmodal.tga"
- name="PermModifyObject"
+ name="NoPermModifyObject"
type="notify">
<tag>fail</tag>
You don't have permission to modify that object
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysObjContributesToNav"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysKeyframedObj"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for keyframed objects.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysNotEnoughLandResources"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysCostTooGreat"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+ </notification>
+
<notification
icon="alertmodal.tga"
name="PhantomWithConcavePiece"
@@ -8876,6 +8909,39 @@ You cannot modify the navmesh across region boundaries.
You don't have permission to modify that object.
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysObjContributesToNav"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysKeyframedObj"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for keyframed objects.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysNotEnoughLandResources"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="CantEnablePhysCostTooGreat"
+ persist="true"
+ type="notify">
+ <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+ </notification>
+
<notification
icon="alertmodal.tga"
name="NoSetPhysicsPropertiesOnObjectType"
@@ -9022,18 +9088,52 @@ Object uses too many physics resources -- its dynamics have been disabled.
<notification
icon="alertmodal.tga"
- name="TeleportAgentByObjectWithParcelInfo"
+ name="TeleportedHomeByObjectOnParcel"
+ persist="true"
type="notify">
<tag>fail</tag>
-You have been teleported home by the object ... on the parcel ...
+You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
</notification>
<notification
icon="alertmodal.tga"
- name="TeleportAgentByObject"
+ name="TeleportedHomeByObject"
+ persist="true"
type="notify">
<tag>fail</tag>
-You have been teleported home by the object ... on the parcel ...
+You have been teleported home by the object '[OBJECT_NAME]'
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TeleportedByAttachment"
+ type="notify">
+ <tag>fail</tag>
+You have been teleported by an attachment on [ITEM_ID]
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TeleportedByObjectOnParcel"
+ type="notify">
+ <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TeleportedByObjectOwnedBy"
+ type="notify">
+ <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="TeleportedByObjectUnknownUser"
+ type="notify">
+ <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]'
</notification>
<notification
@@ -9852,5 +9952,13 @@ You cannot give L$ to public objects.
Inventory creation on in-world object failed.
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="UserBalanceOrLandUsageError"
+ type="notify">
+ <tag>fail</tag>
+An internal error prevented us from properly updating your viewer. The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
+ </notification>
+
</notifications>
--
cgit v1.2.3
From adce92282bd190f97b377512ce76fe375e0f115a Mon Sep 17 00:00:00 2001
From: Chris Baker <baker@lindenlab.com>
Date: Mon, 24 Sep 2012 19:05:37 +0000
Subject: Fixed a localized message that wasn't correct.
---
indra/newview/skins/default/xui/en/notifications.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8c3cdccbdb..232ed2dcb4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9133,7 +9133,7 @@ You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
name="TeleportedByObjectUnknownUser"
type="notify">
<tag>fail</tag>
-You have been teleported by the object '[OBJECT_NAME]'
+You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
</notification>
<notification
--
cgit v1.2.3
From 5f75cf57773a017b6d15d07047b98522c0856b4b Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Tue, 2 Oct 2012 09:30:56 -0700
Subject: MAINT-1526 : Save Back to Inventory has been disabled on server side
but stays in UI. Removed it. Reviewed by Kelly
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 8 --------
1 file changed, 8 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c6d9f9ef8f..59d268c53a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -884,14 +884,6 @@
<menu_item_call.on_enable
function="Tools.EnableTakeCopy" />
</menu_item_call>
- <menu_item_call
- label="Save Back to My Inventory"
- name="Save Object Back to My Inventory">
- <menu_item_call.on_click
- function="Tools.SaveToInventory" />
- <menu_item_call.on_enable
- function="Tools.EnableSaveToInventory" />
- </menu_item_call>
<menu_item_call
label="Save Back to Object Contents"
name="Save Object Back to Object Contents">
--
cgit v1.2.3
From ab38c854c34ada4fc166487b980fa2137badfdb9 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Wed, 17 Oct 2012 16:43:56 -0700
Subject: MAINT-1724 : Viewer crashes while attempt to open '+ inventory'
floater that already opened in separated floater. Changed to non-tearable
menu. Reviewed by Kelly
---
indra/newview/skins/default/xui/en/menu_inventory_add.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index e91f5af3d5..29720a680b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -3,7 +3,7 @@
layout="topleft"
left="0"
mouse_opaque="false"
- can_tear_off="true"
+ can_tear_off="false"
name="menu_inventory_add"
visible="false">
<menu
--
cgit v1.2.3
From 48b2dbcd65e72994054b9e525c0e45e346a981fb Mon Sep 17 00:00:00 2001
From: voidpointer <none@none>
Date: Thu, 18 Oct 2012 15:11:22 -0700
Subject: MAINT-1615 - Something invisible pushes avatars around on Dore
---
indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 232ed2dcb4..c32e23d553 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9960,5 +9960,12 @@ Inventory creation on in-world object failed.
An internal error prevented us from properly updating your viewer. The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="LargePrimAgentIntersect"
+ type="notify">
+ <tag>fail</tag>
+Cannot create large prims that intersect other players. Please re-try when other players have moved.
+ </notification>
</notifications>
--
cgit v1.2.3
From 2126cdb9a25da4dcc4c81659038b85bcff17c4ee Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Wed, 31 Oct 2012 15:05:52 -0700
Subject: MAINT-1560 : Make Slow Motion Animations affect all avatars. Added
new menu. Reviewed by Kelly
---
indra/newview/skins/default/xui/en/menu_viewer.xml | 44 +++++++++++++++++-----
1 file changed, 34 insertions(+), 10 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 59d268c53a..0fc1982a86 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3178,6 +3178,40 @@
parameter="AllowSelectAvatar" />
</menu_item_check>
</menu>
+ <menu
+ create_jump_keys="true"
+ label="Animation Speed"
+ name="Animation Speed"
+ tear_off="true">
+ <menu_item_call
+ label="All Animations 10% Faster"
+ name="All Animations 10 Faster">
+ <menu_item_call.on_click
+ function="Advanced.AnimTenFaster" />
+ </menu_item_call>
+ <menu_item_call
+ label="All Animations 10% Slower"
+ name="All Animations 10 Slower">
+ <menu_item_call.on_click
+ function="Advanced.AnimTenSlower" />
+ </menu_item_call>
+ <menu_item_call
+ label="Reset All Animation Speed"
+ name="Reset All Animation Speed">
+ <menu_item_call.on_click
+ function="Advanced.AnimResetAll" />
+ </menu_item_call>
+ <menu_item_check
+ label="Slow Motion Animations"
+ name="Slow Motion Animations">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="SlowMotionAnimation" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="SlowMotionAnimation" />
+ </menu_item_check>
+ </menu>
<menu_item_call
label="Force Params to Default"
name="Force Params to Default">
@@ -3194,16 +3228,6 @@
function="Advanced.ToggleAnimationInfo"
parameter="" />
</menu_item_check>
- <menu_item_check
- label="Slow Motion Animations"
- name="Slow Motion Animations">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="SlowMotionAnimation" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="SlowMotionAnimation" />
- </menu_item_check>
<menu_item_check
label="Show Look At"
name="Show Look At">
--
cgit v1.2.3
From 7bddf05f89de5b4de094a545082c79d8ae4edb53 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Fri, 16 Nov 2012 15:49:30 -0800
Subject: sync with viewer-development
---
indra/newview/skins/default/xui/de/strings.xml | 2 +-
indra/newview/skins/default/xui/en/panel_login.xml | 11 ++++++++++-
indra/newview/skins/default/xui/en/strings.xml | 2 +-
indra/newview/skins/default/xui/es/strings.xml | 2 +-
indra/newview/skins/default/xui/fr/strings.xml | 2 +-
indra/newview/skins/default/xui/it/strings.xml | 2 +-
indra/newview/skins/default/xui/ja/strings.xml | 2 +-
indra/newview/skins/default/xui/pt/strings.xml | 2 +-
indra/newview/skins/default/xui/ru/strings.xml | 2 +-
indra/newview/skins/default/xui/tr/strings.xml | 2 +-
indra/newview/skins/default/xui/zh/strings.xml | 2 +-
11 files changed, 20 insertions(+), 11 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index aeed9f3796..79cb73ecf9 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
Beenden
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=de-DE
+ http://join.secondlife.com/index.php?lang=de-DE&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 9c96143aa3..134ca75018 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -31,6 +31,7 @@
width="996"/>
<layout_stack
animate="false"
+ clip="false"
follows="left|bottom|right"
name="login_widgets"
layout="topleft"
@@ -68,12 +69,16 @@
width="150">
Username:
</text>
+ <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+ with focus in this combo_box, we can use commit action to initiate
+ login -->
<combo_box
allow_text_entry="true"
follows="left|bottom"
height="22"
left_delta="0"
max_chars="128"
+ commit_on_focus_lost="false"
combo_editor.prevalidate_callback="ascii"
tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
top_pad="0"
@@ -96,6 +101,9 @@
width="150">
Password:
</text>
+ <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+ with focus in this line_editor, we can use commit action to
+ initiate login -->
<line_editor
follows="left|bottom"
height="22"
@@ -103,6 +111,7 @@
name="password_edit"
is_password="true"
select_on_focus="true"
+ commit_on_focus_lost="false"
top_pad="0"
width="135" />
</layout_panel>
@@ -223,7 +232,7 @@
follows="right|bottom"
name="links"
width="210"
- min_width="210"
+ min_width="100"
height="80">
<text
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 15eb46c348..2157a05bbf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -59,7 +59,7 @@
<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
<string name="LoginFailed">Login failed.</string>
<string name="Quit">Quit</string>
- <string name="create_account_url">http://join.secondlife.com/</string>
+ <string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
<string name="LoginFailedViewerNotPermitted">
The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index dcde68a93a..52bcab54e5 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
Salir
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=es-ES
+ http://join.secondlife.com/index.php?lang=es-ES&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 27f0e9464b..6a2a3f559a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
Quitter
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=fr-FR
+ http://join.secondlife.com/index.php?lang=fr-FR&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
Le client que vous utilisez ne permet plus d'accéder à Second Life. Téléchargez un nouveau client à la page suivante :
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 2dc91d316a..fb1e387468 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
Esci
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=it-IT
+ http://join.secondlife.com/index.php?lang=it-IT&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index ee7c11c3e9..50697e5500 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
終了
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=ja-JP
+ http://join.secondlife.com/index.php?lang=ja-JP&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 9f611c08e4..bc72b86020 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
Sair
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=pt-BR
+ http://join.secondlife.com/index.php?lang=pt-BR&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
O visualizador utilizado já não é compatível com o Second Life. Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 6e8ec05e9f..f9ded799bf 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
Выйти
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=ru-RU
+ http://join.secondlife.com/index.php?lang=ru-RU&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index a35e1de721..1be8f5974c 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
Çık
</string>
<string name="create_account_url">
- http://join.secondlife.com/index.php?lang=tr-TR
+ http://join.secondlife.com/index.php?lang=tr-TR&sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
Kullandığınız görüntüleyici ile artık Second Life'a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 2ca99e50d4..3f17324006 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -137,7 +137,7 @@
結束退出
</string>
<string name="create_account_url">
- http://join.secondlife.com/
+ http://join.secondlife.com/?sourceid=[sourceid]
</string>
<string name="LoginFailedViewerNotPermitted">
你目前所用的 Viewer 已經無法再進入第二人生。 請到這個頁面下載最新 Viewer：
--
cgit v1.2.3
From 8f7eee13495bf2a72d0b1a5b81ff2a2e7e556659 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 21 Nov 2012 11:42:51 -0800
Subject: sync with viewer-development
---
indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 63e154697b..2c420aa1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -57,7 +57,7 @@
layout="topleft"
name="take_copy">
<menu_item_call.on_click
- function="InspectObject.TakeFreeCopy"/>
+ function="Tools.TakeCopy"/>
<menu_item_call.on_visible
function="Tools.EnableTakeCopy"/>
</menu_item_call>
--
cgit v1.2.3
From 4aa818055e04739dd0177b9e06e6edea62bf0981 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 26 Nov 2012 13:22:25 -0600
Subject: MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in
setGraphicsLevel
Reviewed by Simon
---
.../default/xui/en/panel_preferences_graphics1.xml | 43 ++++++++++++++++++----
1 file changed, 35 insertions(+), 8 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f7666bdc4c..849f3ef73d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -55,30 +55,57 @@
name="LowGraphicsDivet"
top_delta="-2"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="LowMidraphicsDivet"
+ top_delta="-2"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="83"
+ left_pad="41"
name="MidGraphicsDivet"
top_delta="0"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="MidHighGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="85"
+ left_pad="41"
name="HighGraphicsDivet"
top_delta="0"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="HighUltraGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="83"
+ left_pad="41"
name="UltraGraphicsDivet"
top_delta="0"
width="2" />
@@ -91,7 +118,7 @@
initial_value="0"
layout="topleft"
left="120"
- max_val="3"
+ max_val="6"
name="QualityPerformanceSelection"
show_text="false"
top_delta="-2"
@@ -120,12 +147,12 @@
height="12"
layout="topleft"
left_delta="87"
- name="ShadersPrefText2"
+ name="ShadersPrefText3"
top_delta="0"
width="80">
Mid
</text>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -136,8 +163,8 @@
name="ShadersPrefText3"
top_delta="0"
width="80">
- High
- </text>
+ High
+ </text>
<text
type="string"
length="1"
--
cgit v1.2.3
From bf28ce0eea86e4be1de47da83f4855aafe72688a Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 28 Nov 2012 12:10:00 -0800
Subject: sync with viewer-development
---
.../skins/default/xui/de/panel_navmesh_rebake.xml | 6 ---
indra/newview/skins/default/xui/en/menu_object.xml | 40 +++++++++----------
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++-
.../newview/skins/default/xui/en/notifications.xml | 20 ----------
.../skins/default/xui/en/panel_navmesh_rebake.xml | 45 ----------------------
.../skins/default/xui/es/panel_navmesh_rebake.xml | 6 ---
.../skins/default/xui/fr/panel_navmesh_rebake.xml | 6 ---
.../skins/default/xui/it/panel_navmesh_rebake.xml | 6 ---
.../skins/default/xui/ja/panel_navmesh_rebake.xml | 6 ---
.../skins/default/xui/pt/panel_navmesh_rebake.xml | 6 ---
.../skins/default/xui/ru/panel_navmesh_rebake.xml | 6 ---
.../skins/default/xui/tr/panel_navmesh_rebake.xml | 6 ---
12 files changed, 29 insertions(+), 134 deletions(-)
delete mode 100644 indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
delete mode 100644 indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
deleted file mode 100644
index 44be6d67b1..0000000000
--- a/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Region neu formen" name="navmesh_btn" tool_tip="Klicken, um das Navmesh der Region neu zu formen."/>
- <button label="Neuformen wird angefordert" name="navmesh_btn_sending" tool_tip="Anforderung zum Neuformen wird an den Server gesendet."/>
- <button label="Region wird neu geformt" name="navmesh_btn_baking" tool_tip="Region wird neu geformt. Nach Abschluss des Vorgangs verschwindet diese Schaltfläche."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 52b9524b11..f6004621a6 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -29,26 +29,6 @@
<menu_item_call.on_enable
function="EnableEdit"/>
</menu_item_call>
- <menu_item_call
- label="Show in linksets"
- name="show_in_linksets">
- <menu_item_call.on_click
- function="Pathfinding.Linksets.Select" />
- <menu_item_call.on_enable
- function="EnableSelectInPathfindingLinksets"/>
- <menu_item_call.on_visible
- function="EnableSelectInPathfindingLinksets"/>
- </menu_item_call>
- <menu_item_call
- label="Show in characters"
- name="show_in_characters">
- <menu_item_call.on_click
- function="Pathfinding.Characters.Select" />
- <menu_item_call.on_enable
- function="EnableSelectInPathfindingCharacters"/>
- <menu_item_call.on_visible
- function="EnableSelectInPathfindingCharacters"/>
- </menu_item_call>
<menu_item_call
enabled="false"
label="Open"
@@ -90,6 +70,26 @@
<menu_item_call.on_click
function="Object.ZoomIn" />
</menu_item_call>
+ <menu_item_call
+ label="Show in linksets"
+ name="show_in_linksets">
+ <menu_item_call.on_click
+ function="Pathfinding.Linksets.Select" />
+ <menu_item_call.on_enable
+ function="EnableSelectInPathfindingLinksets"/>
+ <menu_item_call.on_visible
+ function="EnableSelectInPathfindingLinksets"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Show in characters"
+ name="show_in_characters">
+ <menu_item_call.on_click
+ function="Pathfinding.Characters.Select" />
+ <menu_item_call.on_enable
+ function="EnableSelectInPathfindingCharacters"/>
+ <menu_item_call.on_visible
+ function="EnableSelectInPathfindingCharacters"/>
+ </menu_item_call>
<menu_item_separator layout="topleft" />
<context_menu
label="Put On"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1aa55acf2d..18932a32d0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -956,7 +956,7 @@
create_jump_keys="true"
label="Pathfinding"
name="Pathfinding"
- tear_off="false">
+ tear_off="true">
<menu_item_call
label="Linksets..."
name="pathfinding_linksets_menu_item">
@@ -984,6 +984,14 @@
<menu_item_call.on_enable
function="Tools.EnablePathfindingView" />
</menu_item_call>
+ <menu_item_call
+ label="Rebake region"
+ name="pathfinding_rebake_navmesh_item">
+ <menu_item_call.on_click
+ function="Tools.DoPathfindingRebakeRegion"/>
+ <menu_item_call.on_enable
+ function="Tools.EnablePathfindingRebakeRegion" />
+ </menu_item_call>
</menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8e6de6ed4f..9dae77a304 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6074,26 +6074,6 @@ This area has building disabled. You can't build or rez objects here.
Dynamic pathfinding is not enabled on this region. Scripted objects using pathfinding LSL calls may not operate as expected on this region.
</notification>
- <notification
- icon="alertmodal.tga"
- name="PathfindingRebakeNavmesh"
- type="alertmodal">
- <unique/>
- Changing certain objects in this region could cause other moving objects to behave incorrectly. To make moving objects behave correctly, click the “Rebake region” button. Choose “Help” for more information.
- <url
- option="1"
- name="url"
- target = "_external">
- http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
- </url>
- <usetemplate
- name="okhelpignore"
- ignoretext="Changing certain objects in this region could cause other moving objects to behave incorrectly."
- yestext="OK"
- helptext="Help"
- />
- </notification>
-
<notification
icon="alertmodal.tga"
name="PathfindingCannotRebakeNavmesh"
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
deleted file mode 100644
index 90308a2ca9..0000000000
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="25"
- layout="topleft"
- name="panel_navmesh_rebake"
- mouse_opaque="false"
- visible="true"
- width="133">
- <button
- follows="left|bottom"
- height="19"
- label="Rebake region"
- layout="topleft"
- left="10"
- name="navmesh_btn"
- tool_tip="Click to rebake the region's navmesh."
- top="2"
- visible="false"
- enabled="true"
- width="120" />
- <button
- follows="left|bottom"
- height="19"
- label="Requesting rebake"
- layout="topleft"
- left="10"
- name="navmesh_btn_sending"
- tool_tip="Sending rebake request to the server."
- top="2"
- visible="false"
- enabled="false"
- width="120" />
- <button
- follows="left|bottom"
- height="19"
- label="Region is rebaking"
- layout="topleft"
- left="10"
- name="navmesh_btn_baking"
- tool_tip="Region is being rebaked. When completed, this button will disappear."
- top="2"
- visible="false"
- enabled="false"
- width="120" />
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
deleted file mode 100644
index 96df844512..0000000000
--- a/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Recargar la región" name="navmesh_btn" tool_tip="Pulsa para recargar el navmesh de la región."/>
- <button label="Solicitando recarga" name="navmesh_btn_sending" tool_tip="Enviando la solicitud de recarga al servidor."/>
- <button label="La región se está recargando" name="navmesh_btn_baking" tool_tip="La región se está recargando. Este botón desaparecerá cuando finalice la recarga."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
deleted file mode 100644
index 7acf092257..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Refiger la région" name="navmesh_btn" tool_tip="Cliquer pour refiger le maillage de navigation de la région."/>
- <button label="Demande consistant à refiger la région en cours..." name="navmesh_btn_sending" tool_tip="Envoi de la demande consistant à refiger la région au serveur..."/>
- <button label="La région se refige..." name="navmesh_btn_baking" tool_tip="La région se refige. Ce bouton disparaîtra lorsque le processus sera terminé."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
deleted file mode 100644
index 432754076a..0000000000
--- a/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Rebake regione" name="navmesh_btn" tool_tip="Fai clic per eseguire rebake sul navmesh della regione"/>
- <button label="Richiesta rebake" name="navmesh_btn_sending" tool_tip="Invio richiesta rebake al server."/>
- <button label="Rebake regione in corso" name="navmesh_btn_baking" tool_tip="Rebake della regione in corso. Al termine, questo pulsante non sarà più visibile."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
deleted file mode 100644
index ea3ec32424..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="地域の再構築" name="navmesh_btn" tool_tip="クリックしてこの地域のナビメッシュを再構築します。"/>
- <button label="再構築をリクエスト中" name="navmesh_btn_sending" tool_tip="再構築リクエストをサーバーに送信しています。"/>
- <button label="地域（リージョン）を再構築中" name="navmesh_btn_baking" tool_tip="地域を再構築しています。完了すると、このボタンは消えます。"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
deleted file mode 100644
index aa885ae031..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Recarregar região" name="navmesh_btn" tool_tip="Clique para recarregar o navmesh da região."/>
- <button label="Solicitando recarregamento" name="navmesh_btn_sending" tool_tip="Enviando solicitação de recarregamento para o servidor."/>
- <button label="A região está recarregando" name="navmesh_btn_baking" tool_tip="A região está sendo recarregada. Este botão desaparecerá após a conclusão."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
deleted file mode 100644
index fdc374a024..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Восстановить регион" name="navmesh_btn" tool_tip="Восстановить навигационную сетку региона."/>
- <button label="Запрос на восстановление" name="navmesh_btn_sending" tool_tip="Отправка запроса на восстановление на сервер."/>
- <button label="Идет восстановление региона" name="navmesh_btn_baking" tool_tip="Идет восстановление региона. Когда оно завершится, эта кнопка исчезнет."/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
deleted file mode 100644
index 78cb8bcc02..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
- <button label="Bölgeyi yeniden kaydet" name="navmesh_btn" tool_tip="Bölgenin navigasyon örgüsünü tekrar kaydetmek için tıkla."/>
- <button label="Yeniden kaydetme talep ediliyor" name="navmesh_btn_sending" tool_tip="Yeniden kaydetme talebi sunucuya gönderiliyor."/>
- <button label="Bölge yeniden kaydediliyor" name="navmesh_btn_baking" tool_tip="Bölge yeniden kaydediliyor. Tamamlandığında bu düğme kaybolacak."/>
-</panel>
--
cgit v1.2.3
From e83700b56dcf2b0f392b49a79123b78bc7c8fbd9 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 30 Nov 2012 17:03:12 -0600
Subject: MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging
people to update their drivers.
Reviewed by Simon
---
.../newview/skins/default/xui/en/notifications.xml | 39 ++++++++++++++++++++++
1 file changed, 39 insertions(+)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c32e23d553..648a1895c4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1291,6 +1291,45 @@ Visit [_URL] for more information?
<tag>fail</tag>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="AMDOldDriver"
+ type="alertmodal">
+ There is likely a newer driver for your graphics chip. Updating graphics drivers can substantially improve performance.
+
+ Visit [_URL] to check for driver updates?
+ <tag>confirm</tag>
+ <url option="0" name="url">
+ http://support.amd.com/us/Pages/AMDSupportHub.aspx
+ </url>
+ <usetemplate
+ ignoretext="My graphics driver is out of date"
+ name="okcancelignore"
+ notext="No"
+ yestext="Yes"/>
+ <tag>fail</tag>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="NVIDIAOldDriver"
+ type="alertmodal">
+ There is likely a newer driver for your graphics chip. Updating graphics drivers can substantially improve performance.
+
+ Visit [_URL] to check for driver updates?
+ <tag>confirm</tag>
+ <url option="0" name="url">
+ http://www.nvidia.com/Download/index.aspx?lang=en-us
+ </url>
+ <usetemplate
+ ignoretext="My graphics driver is out of date"
+ name="okcancelignore"
+ notext="No"
+ yestext="Yes"/>
+ <tag>fail</tag>
+ </notification>
+
+
<notification
icon="alertmodal.tga"
name="UnknownGPU"
--
cgit v1.2.3
From 739437e56282a04260af0ffad536e4f037a4e3a8 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 12 Dec 2012 17:01:38 -0800
Subject: sync with viewer-development
---
.../default/xui/en/panel_preferences_graphics1.xml | 43 ++++++++++++++++++----
1 file changed, 35 insertions(+), 8 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f7666bdc4c..849f3ef73d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -55,30 +55,57 @@
name="LowGraphicsDivet"
top_delta="-2"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="LowMidraphicsDivet"
+ top_delta="-2"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="83"
+ left_pad="41"
name="MidGraphicsDivet"
top_delta="0"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="MidHighGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="85"
+ left_pad="41"
name="HighGraphicsDivet"
top_delta="0"
width="2" />
+ <icon
+ color="0.12 0.12 0.12 1"
+ height="14"
+ image_name="Rounded_Square"
+ layout="topleft"
+ left_pad="41"
+ name="HighUltraGraphicsDivet"
+ top_delta="0"
+ width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
- left_pad="83"
+ left_pad="41"
name="UltraGraphicsDivet"
top_delta="0"
width="2" />
@@ -91,7 +118,7 @@
initial_value="0"
layout="topleft"
left="120"
- max_val="3"
+ max_val="6"
name="QualityPerformanceSelection"
show_text="false"
top_delta="-2"
@@ -120,12 +147,12 @@
height="12"
layout="topleft"
left_delta="87"
- name="ShadersPrefText2"
+ name="ShadersPrefText3"
top_delta="0"
width="80">
Mid
</text>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -136,8 +163,8 @@
name="ShadersPrefText3"
top_delta="0"
width="80">
- High
- </text>
+ High
+ </text>
<text
type="string"
length="1"
--
cgit v1.2.3
From 1f4f028044eacfd7f5df5fb5045855658e749d4b Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 7 Jan 2013 17:06:28 -0800
Subject: FIX INTL-110 fix corrupted chinese character in translation
---
indra/newview/skins/default/xui/zh/strings.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 3f17324006..3a266abc64 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- This file contains strings that used to be hardcoded in the source.
It is only for those strings which do not belong in a floater.
For example, the strings used in avatar chat bubbles, and strings
@@ -1982,7 +1982,7 @@ http://secondlife.com/viewer-access-faq
新腳本
</string>
<string name="BusyModeResponseDefault">
- 你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。 你的訊息仍將留存並顯示於對���的 IM 面板上供稍後查閱。
+ 你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。 你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
</string>
<string name="MuteByName">
（按名稱）
--
cgit v1.2.3
From b0d39758184b93a06f5f5f972f168af2d86dcdd2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 7 Jan 2013 17:10:37 -0800
Subject: FIX INTL-110 remove utf8 BOM
---
indra/newview/skins/default/xui/zh/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 3a266abc64..7e17ed6864 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- This file contains strings that used to be hardcoded in the source.
It is only for those strings which do not belong in a floater.
For example, the strings used in avatar chat bubbles, and strings
--
cgit v1.2.3