summaryrefslogtreecommitdiff
path: root/indra/newview/llmainlooprepeater.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
committerOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
commit77dc594e79118769087c0e2094c303fc5aaea5d4 (patch)
treeed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/newview/llmainlooprepeater.cpp
parent94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff)
parent1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff)
merge back late changes and tags from release branch
Diffstat (limited to 'indra/newview/llmainlooprepeater.cpp')
-rw-r--r--indra/newview/llmainlooprepeater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmainlooprepeater.cpp b/indra/newview/llmainlooprepeater.cpp
index d73048a28b..5c020e6d98 100644
--- a/indra/newview/llmainlooprepeater.cpp
+++ b/indra/newview/llmainlooprepeater.cpp
@@ -46,7 +46,7 @@ void LLMainLoopRepeater::start(void)
{
if(mQueue != 0) return;
- mQueue = new LLThreadSafeQueue<LLSD>(1024);
+ mQueue = new LLThreadSafeQueue<LLSD>(gAPRPoolp, 1024);
mMainLoopConnection = LLEventPumps::instance().
obtain("mainloop").listen(LLEventPump::inventName(), boost::bind(&LLMainLoopRepeater::onMainLoop, this, _1));
mRepeaterConnection = LLEventPumps::instance().