diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
| commit | 78db8dd83b76466df83abc32d56aa74ac7b180f3 (patch) | |
| tree | 369b4d8db3081fcf71a27572a00d310c7b9aaaf6 /indra/newview/llsurface.cpp | |
| parent | d4f790f72866b43956ce4216bf6471c85f4afc6c (diff) | |
| parent | 3f8172707833f30d3c39d165c975bd3d97511080 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/llsurface.cpp')
| -rw-r--r-- | indra/newview/llsurface.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index 5440b2c9ad..1d479bac8c 100644 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -234,12 +234,7 @@ void LLSurface::createSTexture() { if (!mSTexturep) { - // Fill with dummy gray data. - - //mSTexturep = LLViewerTextureManager::getLocalTexture(sTextureSize, sTextureSize, 3, FALSE); - //mSTexturep->dontDiscard(); - //mSTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); - + // Fill with dummy gray data. // GL NOT ACTIVE HERE LLPointer<LLImageRaw> raw = new LLImageRaw(sTextureSize, sTextureSize, 3); U8 *default_texture = raw->getData(); |