diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llwaterparamset.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llwaterparamset.cpp')
-rw-r--r-- | linden/indra/newview/llwaterparamset.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp index d3068a7..78d882a 100644 --- a/linden/indra/newview/llwaterparamset.cpp +++ b/linden/indra/newview/llwaterparamset.cpp | |||
@@ -72,8 +72,6 @@ LLWaterParamSet::LLWaterParamSet(void) : | |||
72 | wave2.append(0.58f); | 72 | wave2.append(0.58f); |
73 | wave2.append(-.67f); | 73 | wave2.append(-.67f); |
74 | 74 | ||
75 | LLUUID normalMap = LLUUID(gViewerArt.getString("water_normal.tga")); | ||
76 | |||
77 | mParamValues.insert("waterFogColor", vec4); | 75 | mParamValues.insert("waterFogColor", vec4); |
78 | mParamValues.insert("waterFogDensity", 16.0f); | 76 | mParamValues.insert("waterFogDensity", 16.0f); |
79 | mParamValues.insert("underWaterFogMod", 0.25f); | 77 | mParamValues.insert("underWaterFogMod", 0.25f); |
@@ -85,7 +83,7 @@ LLWaterParamSet::LLWaterParamSet(void) : | |||
85 | mParamValues.insert("blurMultiplier", 0.01f); | 83 | mParamValues.insert("blurMultiplier", 0.01f); |
86 | mParamValues.insert("wave1Dir", wave1); | 84 | mParamValues.insert("wave1Dir", wave1); |
87 | mParamValues.insert("wave2Dir", wave2); | 85 | mParamValues.insert("wave2Dir", wave2); |
88 | mParamValues.insert("normalMap", normalMap); | 86 | mParamValues.insert("normalMap", DEFAULT_WATER_NORMAL); |
89 | 87 | ||
90 | } | 88 | } |
91 | 89 | ||