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

Conflicts: indra/newview/llviewerregion.cpp
2015-06-26 20:38:43 -05:00
parent 09f4528bfb 1368cd6816
commit 1e488fef6d
108 changed files with 1129 additions and 676 deletions
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1530,7 +1530,7 @@ void send_agent_resume()
 	LLAppViewer::instance()->resumeMainloopTimeout();
 }

-static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
+LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
 {
 	LLVector3d pos_local;