From 0b5a2cd6a35e9addad84c82c1e37da749a646a77 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 1 Dec 2011 02:21:23 -0600 Subject: [PATCH] Un-break for compilers that don't yet support stringstream copying ala C++0x's MoveConstructible --- indra/llrender/llshadermgr.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 4d8873640..d3e225046 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -764,6 +764,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade dumpObjectLog(ret); error_str = get_object_log(ret); +#if LL_WINDOWS std::stringstream ostr; //dump shader source for debugging for (GLuint i = 0; i < count; i++) @@ -780,6 +781,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade } LL_WARNS("ShaderLoading") << "\n" << ostr.str() << llendl; +#endif // LL_WINDOWS glDeleteObjectARB(ret); //no longer need handle ret = 0; }