Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer

doc/contributions.txt

@@ -228,8 +228,6 @@ Ansariel Hiller
 	SL-13364
 	SL-13858
 	SL-13697
-	SL-14939
-	SL-14940
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191

indra/newview/llfloaterexperienceprofile.cpp

@@ -211,6 +211,20 @@ bool LLFloaterExperienceProfile::experiencePermission( LLHandle<LLFloaterExperie
     return false;
 }
 
+bool LLFloaterExperienceProfile::matchesKey(const LLSD& key)
+{
+    if (key.has("experience_id"))
+    {
+        return mExperienceId == key["experience_id"].asUUID();
+    }
+    else if (key.isUUID())
+    {
+        return mExperienceId == key.asUUID();
+    }
+    // Assume NULL uuid
+    return mExperienceId.isNull();
+}
+
 
 void LLFloaterExperienceProfile::onClickEdit()
 {

indra/newview/llfloaterexperienceprofile.h

@@ -51,6 +51,8 @@ public:
 
     LLFloaterExperienceProfile(const LLSD& data);
     virtual ~LLFloaterExperienceProfile();
+    
+    /* virtual */ bool matchesKey(const LLSD& key);
 
     LLUUID getExperienceId() const { return mExperienceId; }
     void setPreferences( const LLSD& content );

indra/newview/skins/default/xui/en/notifications.xml

@@ -10867,6 +10867,15 @@ Do you want to enable the automatic viewer version display?
 Disabling future updates for this file.
   </notification>
 
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoSaveToContents"
+   type="notify">
+    <tag>fail</tag>
+    Cannot save &lt;nolink&gt;'[OBJ_NAME]'&lt;/nolink&gt; to object contents because you do not have permission to transfer the object's ownership.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="LocalBitmapsUpdateFailedFinal"