diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 12:15:41 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-06 12:15:41 -0800 |
| commit | afe6350160aa93323a6a5d8ef8c6206bffc337e0 (patch) | |
| tree | a26403aaf4ce4aa8098ca54a84a970b9056f05eb /indra/newview/llsurface.cpp | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
| parent | 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 (diff) | |
merge from texture-pipeline
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(); |