diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:21:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:21:06 -0500 |
| commit | 816e8578f9b63640afde942df282ccf5ed1385a5 (patch) | |
| tree | 8b229f6311f46b66ce1e4163776438e392593b23 /indra/newview/llworld.cpp | |
| parent | 678e8621794e774dc6ecc14b9fc3628583e4b935 (diff) | |
Backed out changeset: d0dfe3cda5b1
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rwxr-xr-x | indra/newview/llworld.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 27256af97a..85614f397c 100755 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -101,21 +101,15 @@ LLWorld::LLWorld() : LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4); U8 *default_texture = raw->getData(); + *(default_texture++) = MAX_WATER_COLOR.mV[0]; + *(default_texture++) = MAX_WATER_COLOR.mV[1]; + *(default_texture++) = MAX_WATER_COLOR.mV[2]; + *(default_texture++) = MAX_WATER_COLOR.mV[3]; + + mDefaultWaterTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE); + gGL.getTexUnit(0)->bind(mDefaultWaterTexturep); + mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); - if (default_texture) - { - *(default_texture++) = MAX_WATER_COLOR.mV[0]; - *(default_texture++) = MAX_WATER_COLOR.mV[1]; - *(default_texture++) = MAX_WATER_COLOR.mV[2]; - *(default_texture++) = MAX_WATER_COLOR.mV[3]; - } - - if (mDefaultWaterTexturep) - { - mDefaultWaterTexturep = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE); - gGL.getTexUnit(0)->bind(mDefaultWaterTexturep); - mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); - } } |