diff options
| author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
| commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
| tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/newview/llworld.cpp | |
| parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
| parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) | |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rwxr-xr-x | indra/newview/llworld.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 85614f397c..27256af97a 100755 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -101,15 +101,21 @@ 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); + } } |