Prim blacklisting on derender from Phoenix

2012-02-16 02:30:05 +01:00
parent 647af6c15a
commit 071554acae
5 changed files with 137 additions and 31 deletions
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -80,6 +80,7 @@
 #include "object_flags.h"

 #include "llappviewer.h"
+#include "llfloaterblacklist.h"

 #include "llviewerobjectbackup.h"

@@ -528,6 +529,15 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			}
 #endif

+
+			if(std::find(LLFloaterBlacklist::blacklist_objects.begin(),
+				LLFloaterBlacklist::blacklist_objects.end(),fullid) != LLFloaterBlacklist::blacklist_objects.end())
+			{
+				llinfos << "Blacklisted object asset " << fullid.asString() << " blocked." << llendl; 
+				continue;
+			}
+
+
 			objectp = createObject(pcode, regionp, fullid, local_id, gMessageSystem->getSender());
 			if (!objectp)
 			{