diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llwaterparamset.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llwaterparamset.cpp')
| -rw-r--r-- | indra/newview/llwaterparamset.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp index 78baae8db6..78797eecce 100644 --- a/indra/newview/llwaterparamset.cpp +++ b/indra/newview/llwaterparamset.cpp @@ -72,8 +72,6 @@ LLWaterParamSet::LLWaterParamSet(void) : wave2.append(0.58f); wave2.append(-.67f); - LLUUID normalMap = LLUUID(gViewerArt.getString("water_normal.tga")); - mParamValues.insert("waterFogColor", vec4); mParamValues.insert("waterFogDensity", 16.0f); mParamValues.insert("underWaterFogMod", 0.25f); @@ -85,7 +83,7 @@ LLWaterParamSet::LLWaterParamSet(void) : mParamValues.insert("blurMultiplier", 0.01f); mParamValues.insert("wave1Dir", wave1); mParamValues.insert("wave2Dir", wave2); - mParamValues.insert("normalMap", normalMap); + mParamValues.insert("normalMap", DEFAULT_WATER_NORMAL); } |