diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 69a98970d..98fe69549 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -410,7 +410,7 @@ void LLViewerShaderMgr::setShaders() //Flag base shader objects for deletion //Don't worry-- they won't be deleted until no programs refrence them. std::map::iterator it = mShaderObjects.begin(); - for(it;it!=mShaderObjects.end();++it) + for(; it!=mShaderObjects.end();++it) if(it->second) glDeleteObjectARB(it->second); mShaderObjects.clear(); diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 2b0e15051..8fa582909 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -227,13 +227,13 @@ public: shader_iter beginShaders() const { - return getGlobalShaderList().begin(); + return (shader_iter)(getGlobalShaderList().begin()); //return mShaderList.begin(); } shader_iter endShaders() const { - return getGlobalShaderList().end(); + return (shader_iter)(getGlobalShaderList().end()); //return mShaderList.end(); }