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/llviewerobject.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 0c9ca0152f..4c6f27944f 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -95,13 +95,12 @@
 #include "llworld.h"
 #include "llui.h"
 #include "pipeline.h"
-#include "viewer.h"
+#include "llappviewer.h"
 
 //#define DEBUG_UPDATE_TYPE
 
-extern BOOL		gVelocityInterpolate;
-extern BOOL		gPingInterpolate;
-extern U32		gFrameCount;
+BOOL gVelocityInterpolate = TRUE;
+BOOL gPingInterpolate = TRUE; 
 
 U32			LLViewerObject::sNumZombieObjects = 0;
 S32			LLViewerObject::sNumObjects = 0;
-- 
cgit v1.3