newview V3 partial merge.

2011-08-30 01:05:59 -05:00
parent 8d23a7d1d4
commit fd317a4092
29 changed files with 390 additions and 350 deletions
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -46,6 +46,7 @@
 #include "llregionhandle.h"
 #include "llsurface.h"
 #include "llviewercamera.h"
+#include "llviewertexture.h"
 #include "llviewertexturelist.h"
 #include "llviewernetwork.h"
 #include "llviewerobjectlist.h"