Merge shyotl, setting include broken (disabled)

2010-11-09 15:14:34 +01:00
parent 8d6ce154fd f357842265
commit 17a0d13b0c
61 changed files with 3320 additions and 2231 deletions
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -436,7 +436,6 @@ S32 LLQueuedThread::processNextRequest()
 			lockData();
 			req->setStatus(STATUS_COMPLETE);
 			
-
 			req->finishRequest(true);

 			if ((req->getFlags() & FLAG_AUTO_COMPLETE))