Merge branch 'master' of https://github.com/siana/SingularityViewer

2011-12-01 12:13:56 -05:00
parent f40bbb1602 aeb766ee37
commit f5a08b1c12
4 changed files with 29 additions and 6 deletions
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -775,7 +775,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 					{ //dump every 128 lines

 						LL_WARNS("ShaderLoading") << "\n" << ostr.str() << llendl;
-						ostr = std::stringstream();
+						ostr.str("");
+						ostr.clear();
 					}

 				}