From 822183057b13c8187d9dab68232b4274bc3ec3b2 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 26 Jul 2017 15:49:55 +0300
Subject: MAINT-7637 Don't allow adding own avatar to rendering exceptions list

---
 indra/newview/llfloateravatarrendersettings.cpp      | 7 +++++++
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloateravatarrendersettings.cpp b/indra/newview/llfloateravatarrendersettings.cpp
index 2bae7d63aa..8bdb70a20d 100644
--- a/indra/newview/llfloateravatarrendersettings.cpp
+++ b/indra/newview/llfloateravatarrendersettings.cpp
@@ -27,11 +27,13 @@
 
 #include "llfloateravatarrendersettings.h"
 
+#include "llagent.h"
 #include "llavatarnamecache.h"
 #include "llfloateravatarpicker.h"
 #include "llfiltereditor.h"
 #include "llfloaterreg.h"
 #include "llnamelistctrl.h"
+#include "llnotificationsutil.h"
 #include "llmenugl.h"
 #include "lltrans.h"
 #include "llviewerobjectlist.h"
@@ -268,6 +270,11 @@ void LLFloaterAvatarRenderSettings::onClickAdd(const LLSD& userdata)
 void LLFloaterAvatarRenderSettings::callbackAvatarPicked(const uuid_vec_t& ids, S32 visual_setting)
 {
     if (ids.empty()) return;
+    if(ids[0] == gAgentID)
+    {
+        LLNotificationsUtil::add("AddSelfRenderExceptions");
+        return;
+    }
     setAvatarRenderSetting(ids[0], visual_setting);
 }
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 71b0edb572..6147005d22 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6573,6 +6573,13 @@ Topic: [SUBJECT], Message: [MESSAGE]
 Although you&apos;re very nice, you can&apos;t add yourself as a friend.
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="AddSelfRenderExceptions"
+   type="notifytip">
+You can&apos;t add yourself to the rendering exceptions list.
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="UploadingAuctionSnapshot"
-- 
cgit v1.2.3