diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-09 15:59:29 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-09 15:59:29 +0200 |
| commit | 1b0732183e4437ce673b13c8092f8122db884587 (patch) | |
| tree | dc913dbaab1699bb27854d9f22531aa2a6f86e28 /indra/newview/llsurface.cpp | |
| parent | 148a29ea1ec97922180ca8f0f6ced9a4a9e05c07 (diff) | |
| parent | 21c51025da7f9128a1b425a5e88331ae0e3fe4d4 (diff) | |
Merge
--HG--
branch : product-engine
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(); |
