Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Conflicts:
	indra/newview/lldynamictexture.cpp
This commit is contained in:
Siana Gearz
2012-03-31 01:54:53 +02:00
17 changed files with 752 additions and 757 deletions

View File

@@ -645,7 +645,7 @@ void LLMultisampleBuffer::release()
if (mTex.size() > 0)
{
sBytesAllocated -= mResX*mResY*4*mResX*mResY*4*mTex.size();
sBytesAllocated -= mResX*mResY*4*mTex.size();
glDeleteRenderbuffers(mTex.size(), (GLuint *) &mTex[0]);
mTex.clear();