Merge branch 'AlericMaster' into V2Renderer

Conflicts: indra/llcommon/aithreadsafe.h indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
parent dff4e97c80 179885d120
commit 77f09744ab
190 changed files with 9247 additions and 3119 deletions
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -192,4 +192,9 @@ protected:
 	~LLAssetType() {}
 };

+#ifdef CWDEBUG
+#include <iosfwd>
+inline std::ostream& operator<<(std::ostream& os, LLAssetType::EType type) { return os << LLAssetType::getDesc(type); }
+#endif
+
 #endif // LL_LLASSETTYPE