From 506c3b072afbe0e076279e8cb38b514458882f47 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 11 Jan 2019 16:29:25 -0800
Subject: SL-10350: If the item is now owned by the current user assume it is
 in the libary.  Don't let them edit.

---
 indra/newview/llinventorybridge.cpp                  |  5 ++++-
 indra/newview/skins/default/xui/en/notifications.xml | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 142720dd03..fda77c72c0 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -6971,7 +6971,10 @@ void LLSettingsBridge::openItem()
     LLViewerInventoryItem* item = getItem();
     if (item)
     {
-        LLInvFVBridgeAction::doAction(item->getType(), mUUID, getInventoryModel());
+        if (item->getPermissions().getOwner() != gAgent.getID())
+            LLNotificationsUtil::add("NoEditFromLibrary");
+        else
+            LLInvFVBridgeAction::doAction(item->getType(), mUUID, getInventoryModel());
     }
 }
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b4cfe9d1b5..9ca9d4cd51 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11322,4 +11322,14 @@ Are you sure you want to continue?
      yestext="Yes"/>
   </notification>
   
+  <notification
+   icon="notify.tga"
+   name="NoEditFromLibrary"
+   persist="true"
+   type="alertmodal">
+You may not edit settings directly from the libary.  
+Please copy to your own inventory and try again.
+  <tag>fail</tag>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3