From 050dad0ce35207a4ac1562175e853590ad9b7681 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 7 Nov 2007 22:55:27 +0000
Subject: merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r
 73026:73079

---
 indra/newview/llviewerobjectlist.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llviewerobjectlist.cpp')

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 967f018f0d..38efb5de11 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -42,7 +42,6 @@
 #include "llvoavatar.h"
 #include "llviewerobject.h"
 #include "llviewerwindow.h"
-#include "viewer.h"
 #include "llnetmap.h"
 #include "llagent.h"
 #include "pipeline.h"
@@ -71,11 +70,9 @@
 #endif
 #include "object_flags.h"
 
-extern BOOL gVelocityInterpolate;
-extern BOOL gPingInterpolate;
+#include "llappviewer.h"
+
 extern F32 gMinObjectDistance;
-extern U32 gFrameCount;
-extern LLTimer gRenderStartTime;
 extern BOOL gAnimateTextures;
 
 void dialog_refresh_all();
-- 
cgit v1.2.3