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

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp

indra/llcharacter/llmotioncontroller.cpp

@@ -837,6 +837,7 @@ void LLMotionController::updateMotions(bool force_update)
 				}
 
 				updateLoadingMotions();
+
 				return;
 			}