summaryrefslogtreecommitdiff
path: root/indra/newview/llcommandhandler.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-04-14 11:44:11 -0700
committerRichard Linden <none@none>2011-04-14 11:44:11 -0700
commit1fbdd880d9ad3bb660d6b1fa20c643613f09eb06 (patch)
treee839396f6dc88fb21b6e8be2bb25a8da72e32f96 /indra/newview/llcommandhandler.cpp
parent8c7d9bbd064c605b756ebf4752eaefad25ee6f4f (diff)
parent67aba3395d46a9b88f9d5dc758a27a7d8e542c16 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-3
Diffstat (limited to 'indra/newview/llcommandhandler.cpp')
-rw-r--r--indra/newview/llcommandhandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp
index bb1fb41fae..19dba3f917 100644
--- a/indra/newview/llcommandhandler.cpp
+++ b/indra/newview/llcommandhandler.cpp
@@ -35,7 +35,7 @@
// system includes
#include <boost/tokenizer.hpp>
-#define THROTTLE_PERIOD 20 // required secs between throttled commands
+#define THROTTLE_PERIOD 5 // required seconds between throttled commands
static LLCommandDispatcherListener sCommandDispatcherListener;
@@ -134,7 +134,7 @@ bool LLCommandHandlerRegistry::dispatch(const std::string& cmd,
if (cur_time < last_throttle_time + THROTTLE_PERIOD)
{
// block request from external browser if it happened
- // within THROTTLE_PERIOD secs of the last command
+ // within THROTTLE_PERIOD seconds of the last command
LL_WARNS_ONCE("SLURL") << "Throttled SLURL command from untrusted browser" << LL_ENDL;
if (! slurl_throttled)
{