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

2013-02-03 22:27:53 +01:00
parent 064601ae5e 0a6bebf9db
commit dc3f91b121
500 changed files with 1323 additions and 115 deletions
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -927,11 +927,6 @@ void LLViewerRegion::calculateCameraDistance()
 	mCameraDistanceSquared = (F32)(gAgentCamera.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared();
 }

-U32 LLViewerRegion::getNetDetailsForLCD()
-{
-	return mPingDelay;
-}
-
 std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region)
 {
 	s << "{ ";