diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-11-07 22:55:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-11-07 22:55:27 +0000 |
| commit | 050dad0ce35207a4ac1562175e853590ad9b7681 (patch) | |
| tree | be5dc291d2313112e5733d8c004edfe67da6fc54 /indra/newview/llviewerobjectlist.cpp | |
| parent | 6fd04521d720a3a4904069d10e8ed970d870ba7f (diff) | |
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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(); |