diff options
author | David Walter Seikel | 2012-04-03 06:44:43 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-03 06:44:43 +1000 |
commit | 35185ce25ec3384afec4cf5a8114037a96c8cb2a (patch) | |
tree | 6158af3f7e973d08532193c36a4d6e49723abc1f /linden/indra/newview | |
parent | One more water notecard refactor. (diff) | |
download | meta-impy-35185ce25ec3384afec4cf5a8114037a96c8cb2a.zip meta-impy-35185ce25ec3384afec4cf5a8114037a96c8cb2a.tar.gz meta-impy-35185ce25ec3384afec4cf5a8114037a96c8cb2a.tar.bz2 meta-impy-35185ce25ec3384afec4cf5a8114037a96c8cb2a.tar.xz |
Revert the fix for http://redmine.kokuaviewer.org/issues/415 as it will be fixed in a more future proof way on the next commit.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/lightshare.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp index 1814f4a..378a755 100644 --- a/linden/indra/newview/lightshare.cpp +++ b/linden/indra/newview/lightshare.cpp | |||
@@ -77,10 +77,7 @@ LightShare::LightShare( LLMessageSystem* msg ) : | |||
77 | buf, size, 0, 249); | 77 | buf, size, 0, 249); |
78 | 78 | ||
79 | mWater = new LLWaterParamSet(); | 79 | mWater = new LLWaterParamSet(); |
80 | // mSky = new LLWLParamSet(); | 80 | mSky = new LLWLParamSet(); |
81 | LLWLParamManager * wl_param_mgr = LLWLParamManager::instance(); | ||
82 | static LLWLParamSet & sSky = wl_param_mgr->mCurParams; | ||
83 | mSky = &sSky; | ||
84 | 81 | ||
85 | mWaterNormal = new LLUUID(); | 82 | mWaterNormal = new LLUUID(); |
86 | 83 | ||
@@ -96,7 +93,7 @@ LightShare::LightShare( LLMessageSystem* msg ) : | |||
96 | LightShare::~LightShare() | 93 | LightShare::~LightShare() |
97 | { | 94 | { |
98 | delete mWater; | 95 | delete mWater; |
99 | // delete mSky; | 96 | delete mSky; |
100 | delete mWaterNormal; | 97 | delete mWaterNormal; |
101 | } | 98 | } |
102 | 99 | ||