summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2015-03-18 17:06:18 -0700
committerMerov Linden <merov@lindenlab.com>2015-03-18 17:06:18 -0700
commitb4d22741a6118719d45f278ed64f2c4635f0058e (patch)
tree0025dc54a2150d5b8f896d53908e22841b4db3d9 /indra/newview/skins/default
parent1dd5c338d2726cc6c0f717e64d52c051d19b9732 (diff)
DD-337 : Validate the version folder before setting it and show error dialog if error
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d672d29f1..8453152613 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -374,6 +374,19 @@ Initialization with the Marketplace failed because of a system or network error.
</notification>
<notification
+ icon="OutboxStatus_Error"
+ name="MerchantFolderActivationFailed"
+ type="outbox">
+ Activating this version folder failed with error :
+
+ &apos;[ERROR_CODE]&apos;
+
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="ConfirmMerchantActiveChange"
type="alertmodal">