From 8be5c8eade832796c34f035547cf09095a85d3f4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 14 Apr 2015 14:10:38 +0300
Subject: MAINT-5090 Remove disabling HTTP Inventory from Viewer

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
 1 file changed, 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 658c716ee7..b75d614dcc 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3590,16 +3590,6 @@
              function="ToggleControl"
              parameter="ImagePipelineUseHTTP" />
         </menu_item_check>
-        <menu_item_check
-         label="HTTP Inventory"
-         name="HTTP Inventory">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="UseHTTPInventory" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="UseHTTPInventory" />
-        </menu_item_check>
         <menu_item_call
          label="Compress Images"
          name="Compress Images">
-- 
cgit v1.2.3


From 11ed48abd15d0fcc1e41a9a122a081785d82f917 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 14 Apr 2015 21:21:29 +0300
Subject: MAINT-5097 FIXED crash in LLFloaterPay::onGive

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 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 632396d58c..28565a85c6 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5275,6 +5275,17 @@ Warning: The &apos;Pay object&apos; click action has been set, but it will only
      yestext="Pay"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PayObjectFailed"
+   type="alertmodal">
+    Payment failed: object was not found.
+    <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="OpenObjectCannotCopy"
-- 
cgit v1.2.3