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

GCCified SH_SpamHandler

Browse Source
This commit is contained in:
Siana Gearz
2011-05-01 04:57:44 +02:00
parent 1d90b8624b
commit ae50fc4404
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewermessage.cpp
View File

@@ -255,7 +255,7 @@ public:
mBlockedList.clear(); mBlockedList.clear();
return true; return true;
} }
bool isBlocked(const T &owner, const LLUUID &source_id, const char *pNotification, LLSD &args=LLSD()) bool isBlocked(const T &owner, const LLUUID &source_id, const char *pNotification, LLSD args=LLSD())
{ {
if(!mEnabled || isAgent(owner)) if(!mEnabled || isAgent(owner))
return false; return false;
@@ -263,7 +263,7 @@ public:
return true; return true;
if(mTimer.getStarted() && mTimer.getElapsedTimeF32() < mDuration) if(mTimer.getStarted() && mTimer.getElapsedTimeF32() < mDuration)
{ {
std::map<const T,U32>::iterator it = mActiveList.insert(std::pair<const T, U32>(owner,0)).first; typename std::map<const T,U32>::iterator it = mActiveList.insert(std::pair<const T, U32>(owner,0)).first;
if(++(it->second)>=mFrequency) if(++(it->second)>=mFrequency)
{ {
mBlockedList.insert(owner); mBlockedList.insert(owner);
@@ -285,16 +285,16 @@ public:
} }
private: private:
//Owner is either a key, or a name. Do not look up perms since object may be unknown. //Owner is either a key, or a name. Do not look up perms since object may be unknown.
bool isAgent(const T &owner) const; static bool isAgent(const T &owner);
bool mEnabled; bool mEnabled;
LLFrameTimer mTimer; LLFrameTimer mTimer;
const LLCachedControl<F32> mDuration; const LLCachedControl<F32> mDuration;
const LLCachedControl<U32> mFrequency; const LLCachedControl<U32> mFrequency;
std::map<const T,U32> mActiveList; std::map<const T,U32> mActiveList;
std::set<const T> mBlockedList; std::set<T> mBlockedList;
}; };
template<> bool SH_SpamHandler<LLUUID>::isAgent(const LLUUID &owner) const { return gAgent.getID() == owner; } template<> bool SH_SpamHandler<LLUUID>::isAgent(const LLUUID &owner) { return gAgent.getID() == owner; }
template<> bool SH_SpamHandler<std::string>::isAgent(const std::string &owner) const template<> bool SH_SpamHandler<std::string>::isAgent(const std::string &owner)
{ {
std::string str; std::string str;
gAgent.getName(str); gAgent.getName(str);