From 24b26d71ee01211aa796b8061b66ec06a133e4ce Mon Sep 17 00:00:00 2001
From: Dave Simmons <simon@lindenlab.com>
Date: Fri, 20 Mar 2009 20:00:47 +0000
Subject: svn merge -r113004:115000
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge
 latest 1.26 into trunk

---
 indra/llcommon/llqueuedthread.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llqueuedthread.cpp')

diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 7e0fb27d60..cd53e701d2 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -197,8 +197,9 @@ LLQueuedThread::handle_t LLQueuedThread::generateHandle()
 	{
 		mNextHandle++;
 	}
+	const LLQueuedThread::handle_t res = mNextHandle++;
 	unlockData();
-	return mNextHandle++;
+	return res;
 }
 
 // MAIN thread
-- 
cgit v1.2.3