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

Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml

indra/newview/llstartup.cpp

@@ -221,6 +221,8 @@
 #include "shfloatermediaticker.h"
 // </edit>
 
+#include "llpathfindingmanager.h"
+
 #include "llavatarnamecache.h"
 #include "lgghunspell_wrapper.h"
 
@@ -2740,6 +2742,10 @@ bool idle_startup()
 		// reset timers now that we are running "logged in" logic
 		LLFastTimer::reset();
 		display_startup();
+
+		llassert(LLPathfindingManager::getInstance() != NULL);
+		LLPathfindingManager::getInstance()->initSystem();
+
 		return TRUE;
 	}