Put in some changes along sg1.4 dev history.

2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -33,6 +33,8 @@
 #ifndef LL_LLAPPVIEWER_H
 #define LL_LLAPPVIEWER_H

+#include "llsys.h"	// LLOSInfo
+
 class LLTextureCache;
 class LLImageDecodeThread;
 class LLTextureFetch;