Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2011-05-01 23:11:38 +02:00
parent 2ba1dbf9da d8caa6a980
commit 50f6d7b677
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermessage.cpp
View File

@@ -1709,10 +1709,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
static SH_SpamHandler<LLUUID> object_spam_check("SGBlockGeneralSpam","SGSpamTime","SGSpamCount"); static SH_SpamHandler<LLUUID> object_spam_check("SGBlockGeneralSpam","SGSpamTime","SGSpamCount");
if(d==IM_FROM_TASK||d==IM_GOTO_URL||d==IM_FROM_TASK_AS_ALERT||d==IM_TASK_INVENTORY_OFFERED||d==IM_TASK_INVENTORY_ACCEPTED||d==IM_TASK_INVENTORY_DECLINED) if(d==IM_FROM_TASK||d==IM_GOTO_URL||d==IM_FROM_TASK_AS_ALERT||d==IM_TASK_INVENTORY_OFFERED||d==IM_TASK_INVENTORY_ACCEPTED||d==IM_TASK_INVENTORY_DECLINED)
{ {
if(object_spam_check.isBlocked(from_id,session_id,"BlockedGeneralObjects"),args) if(object_spam_check.isBlocked(from_id,session_id,"BlockedGeneralObjects",args))
return; return;
} }
else if(avatar_spam_check.isBlocked(from_id,from_id,"BlockedGeneralAvatar"),args) else if(avatar_spam_check.isBlocked(from_id,from_id,"BlockedGeneralAvatar",args))
return; return;
} }