summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llsurface.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index 39f6a6c396..eadb311919 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -236,12 +236,13 @@ void LLSurface::createSTexture()
{
// Fill with dummy gray data.
- mSTexturep = LLViewerTextureManager::getLocalTexture(sTextureSize, sTextureSize, 3, FALSE);
- mSTexturep->dontDiscard();
- mSTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
+ //mSTexturep = LLViewerTextureManager::getLocalTexture(sTextureSize, sTextureSize, 3, FALSE);
+ //mSTexturep->dontDiscard();
+ //mSTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
// GL NOT ACTIVE HERE
- /*U8 *default_texture = raw->getData();
+ LLPointer<LLImageRaw> raw = new LLImageRaw(sTextureSize, sTextureSize, 3);
+ U8 *default_texture = raw->getData();
for (S32 i = 0; i < sTextureSize; i++)
{
for (S32 j = 0; j < sTextureSize; j++)
@@ -255,8 +256,7 @@ void LLSurface::createSTexture()
mSTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);
mSTexturep->dontDiscard();
gGL.getTexUnit(0)->bind(mSTexturep);
- mSTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);*/
-
+ mSTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
}
}