Merge branch 'develop' into maxim/lua-nearby-avatars

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
index 034e3f7897..7a5eb5b33d 100644
--- a/indra/llcommon/llthreadsafequeue.h
+++ b/indra/llcommon/llthreadsafequeue.h
@@ -452,7 +452,10 @@ ElementT LLThreadSafeQueue<ElementT, QueueT>::pop(void)
         // so we can finish draining the queue.
         pop_result popped = pop_(lock1, value);
         if (popped == POPPED)
-            return std::move(value);
+            // don't use std::move when returning local value because
+            // it prevents the compiler from optimizing with copy elision
+            //return std::move(value);
+            return value;
 
         // Once the queue is DONE, there will never be any more coming.
         if (popped == DONE)