aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorArmin Weatherwax2010-08-26 10:04:39 +0200
committerMcCabe Maxsted2010-08-28 05:01:51 -0700
commit488d8d6a4027cbd8eb6112b66b22a322a45c70dd (patch)
treed0bbc3d3734e134afcd1c222db3656a6d803a5cd
parentUpdated boost 1.36 libs for Windows to support local textures (todo: update b... (diff)
downloadmeta-impy-488d8d6a4027cbd8eb6112b66b22a322a45c70dd.zip
meta-impy-488d8d6a4027cbd8eb6112b66b22a322a45c70dd.tar.gz
meta-impy-488d8d6a4027cbd8eb6112b66b22a322a45c70dd.tar.bz2
meta-impy-488d8d6a4027cbd8eb6112b66b22a322a45c70dd.tar.xz
tx Oh: fix bug #415 lightshare update not fluently
-rw-r--r--linden/indra/newview/lightshare.cpp8
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 ) :
93WindlightMessage::~WindlightMessage() 97WindlightMessage::~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