Merge remote-tracking branch 'shyotl/future' into AltCompilers

Conflicts: indra/llrender/llrendertarget.cpp indra/newview/llvovolume.cpp
2012-08-08 18:54:04 -04:00
parent 457177905d d2b13f515d
commit e767392b44
82 changed files with 2312 additions and 1578 deletions
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -837,6 +837,7 @@ void LLMotionController::updateMotions(bool force_update)
 				}

 				updateLoadingMotions();
+
 				return;
 			}