2 files changed, 11 insertions, 12 deletions
diff --git a/indra/newview/groupchatlistener.cpp b/indra/newview/groupchatlistener.cpp
index 09951ba1cc..298f41ff8c 100644
--- a/indra/newview/groupchatlistener.cpp
+++ b/indra/newview/groupchatlistener.cpp
@@ -43,7 +43,8 @@ static const F32 GROUP_CHAT_THROTTLE_PERIOD = 1.f;
 LLGroupChatListener::LLGroupChatListener():
     LLEventAPI("GroupChat",
                "API to enter, leave, send and intercept group chat messages"),
-    mLastThrottleTime(0)
+    mIMThrottle("sendGroupIM", &LLGroupChatListener::sendGroupIM_, this,
+                GROUP_CHAT_THROTTLE_PERIOD)
 {
     add("startGroupChat",
         "Enter a group chat in group with UUID [\"group_id\"]\n"
@@ -101,18 +102,14 @@ void LLGroupChatListener::sendGroupIM(LLSD const &data)
         return;
     }
 
-    F64 cur_time = LLTimer::getElapsedSeconds();
-
-    if (cur_time < mLastThrottleTime + GROUP_CHAT_THROTTLE_PERIOD)
-    {
-        LL_DEBUGS("LLGroupChatListener") << "'sendGroupIM' was  throttled" << LL_ENDL;
-        return;
-    }
-    mLastThrottleTime = cur_time;
+    mIMThrottle(data["group_id"], data["message"]);
+}
 
-    LLUUID group_id(data["group_id"]);
-    LLIMModel::sendMessage(LUA_PREFIX + data["message"].asString(),
+void LLGroupChatListener::sendGroupIM_(const LLUUID& group_id, const std::string& message)
+{
+    LLIMModel::sendMessage(LUA_PREFIX + message,
                            gIMMgr->computeSessionID(IM_SESSION_GROUP_START, group_id),
                            group_id,
                            IM_SESSION_SEND);
 }
+
diff --git a/indra/newview/groupchatlistener.h b/indra/newview/groupchatlistener.h
index 35afc5766c..a75fecb254 100644
--- a/indra/newview/groupchatlistener.h
+++ b/indra/newview/groupchatlistener.h
@@ -30,6 +30,7 @@
 #define LL_LLGROUPCHATLISTENER_H
 
 #include "lleventapi.h"
+#include "throttle.h"
 
 class LLGroupChatListener: public LLEventAPI
 {
@@ -40,8 +41,9 @@ private:
     void startGroupChat(LLSD const &data);
     void leaveGroupChat(LLSD const &data);
     void sendGroupIM(LLSD const &data);
+    void sendGroupIM_(const LLUUID& group_id, const std::string& message);
 
-    F64 mLastThrottleTime {0.0};
+    LogThrottle<LLError::LEVEL_DEBUG, void(const LLUUID&, const std::string&)> mIMThrottle;
 };
 
 #endif /* ! defined(LL_LLGROUPCHATLISTENER_H) */