diff options
author | Armin Weatherwax | 2010-08-26 10:04:39 +0200 |
---|---|---|
committer | McCabe Maxsted | 2010-08-26 11:28:28 -0700 |
commit | 81d76742d85a96a848bb8322349e1d985db0615f (patch) | |
tree | 229dc48902d7fd026ecfd70644779b1c3a3db6a1 /linden/indra/newview/lightshare.cpp | |
parent | Added AAC decoding to GStreamer for Windows (diff) | |
download | meta-impy-81d76742d85a96a848bb8322349e1d985db0615f.zip meta-impy-81d76742d85a96a848bb8322349e1d985db0615f.tar.gz meta-impy-81d76742d85a96a848bb8322349e1d985db0615f.tar.bz2 meta-impy-81d76742d85a96a848bb8322349e1d985db0615f.tar.xz |
tx Oh: fix bug #415 lightshare update not fluently
Diffstat (limited to 'linden/indra/newview/lightshare.cpp')
-rw-r--r-- | linden/indra/newview/lightshare.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp index 78d27b5..4f8b1e2 100644 --- a/linden/indra/newview/lightshare.cpp +++ b/linden/indra/newview/lightshare.cpp | |||
@@ -78,7 +78,11 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) : | |||
78 | buf, size, 0, 249); | 78 | buf, size, 0, 249); |
79 | 79 | ||
80 | mWater = new LLWaterParamSet(); | 80 | mWater = new LLWaterParamSet(); |
81 | mSky = new LLWLParamSet(); | 81 | // mSky = new LLWLParamSet(); |
82 | LLWLParamManager * wl_param_mgr = LLWLParamManager::instance(); | ||
83 | static LLWLParamSet & sSky = wl_param_mgr->mCurParams; | ||
84 | mSky = &sSky; | ||
85 | |||
82 | mWaterNormal = new LLUUID(); | 86 | mWaterNormal = new LLUUID(); |
83 | 87 | ||
84 | process_packet(&buf[0]); | 88 | process_packet(&buf[0]); |
@@ -93,7 +97,7 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) : | |||
93 | WindlightMessage::~WindlightMessage() | 97 | WindlightMessage::~WindlightMessage() |
94 | { | 98 | { |
95 | delete mWater; | 99 | delete mWater; |
96 | delete mSky; | 100 | // delete mSky; |
97 | delete mWaterNormal; | 101 | delete mWaterNormal; |
98 | } | 102 | } |
99 | 103 | ||