Merge branch 'future' of git://github.com/Shyotl/SingularityViewer

Conflicts: indra/newview/llvovolume.cpp
2012-08-01 06:48:42 -04:00
parent 1c9f996248 1d1947c51a
commit e03de192c8
62 changed files with 2031 additions and 1417 deletions
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -837,6 +837,7 @@ void LLMotionController::updateMotions(bool force_update)
 				}

 				updateLoadingMotions();
+
 				return;
 			}