summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-24 18:57:49 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-24 19:00:48 +0300
commitf3216ca1cd6e63a254123635c18ba661297e8eef (patch)
tree59ffd4eaa7577ce8fbc5aca2503984ff80e132cf /indra/newview/skins
parent23f20c207d1e69c03e2ce2cb9100ad216ac60708 (diff)
SL-12688 Warnings part #2
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml4
2 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f59ac450f2..196d507507 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8946,7 +8946,7 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran
name="okignore"
yestext="OK"/>
</notification>
-
+
<notification
icon="alertmodal.tga"
name="FacePasteFailed"
@@ -8959,6 +8959,19 @@ Paste failed. [REASON]
<notification
icon="alertmodal.tga"
+ name="FacePasteTexturePermissions"
+ type="alertmodal">
+ You applied a texture with limited permissions, object will inherit permissions from texture.
+ <usetemplate
+ ignoretext="Paste: You applied a texture with limited permissions"
+ name="notifyignore"/>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="ConfirmLeaveCall"
type="alertmodal">
Are you sure you want to leave this call?
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index d7bccd3aea..a33d425964 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -19,6 +19,10 @@
name="paste_error_object_face_count_mismatch">
When all faces of an object are copied, the target object must have the same number of faces.
</panel.string>
+ <panel.string
+ name="paste_error_inventory_not_found">
+ One or more texture not found in inventory.
+ </panel.string>
<menu_button
menu_filename="menu_copy_paste_color.xml"