livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging last fixes for ParcelWL from Phoenix 

--HG--
branch : Windlight
meow-7.2.2
Kadah 2011-01-01 14:51:53 -08:00
parent c3f37814a5
commit ba11ae1a7a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/kcwlinterface.cpp
View File

@ -160,11 +160,13 @@ void KCWindlightInterface::ApplySkySettings(const LLSD& settings)
{
S32 lower = (*space_it)["lower"].asInteger();
S32 upper = (*space_it)["upper"].asInteger();
if ( (z >= lower) && (z <= upper) && (lower != mCurrentSpace) )
if ( (z >= lower) && (z <= upper) )
{
if (lower != mCurrentSpace) //workaround: only apply once
{
mCurrentSpace = lower; //use lower as an id
//llinfos << "WL set : " << z << " " << lower << "-" << upper << " : " << (*space_it)["preset"] << llendl;
ApplyWindLightPreset((*space_it)["preset"].asString());
}
return;
}
}
@ -384,7 +386,7 @@ bool KCWindlightInterface::ParsePacelForWLSettings(const std::string& desc, LLSD
}
}
}
else if (match[3].matched)
else if (match[4].matched)
{
std::string preset(match[5]);
//llinfos << "got water: " << preset << llendl;