summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-01-04 23:38:26 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-01-04 23:38:26 +0000
commit3be8a9cc117587157d0591194cb085ad825f8986 (patch)
treea553d165a10dc128a4ffec43f45ab28d9d8bfc78 /indra/newview
parentd60f16540dba5616cd8260046b44ebc2a1047065 (diff)
Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-shuffle into release.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerobjectlist.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index e2c1bc0695..b630572a9b 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -10,7 +10,6 @@
#include "llviewerobjectlist.h"
-#include "gpw.h"
#include "message.h"
#include "timing.h"
#include "llfasttimer.h"