Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed region windlight on OpenSim. It's not possible to assume that the mere existance of M7WL should mean override of RegionWindlight as M7WL is always sent. If M7WL is to have a preference some other method must be devised, ie. a debug setting

Browse Source
This commit is contained in:
Latif Khalifa
2012-08-14 21:30:25 +02:00
parent 74772a1f61
commit 258fe8bad0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llenvmanager.cpp
View File

@@ -494,13 +494,11 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
// Load region sky presets.
LLWLParamManager::instance().refreshRegionPresets();
bool bOverridden = M7WindlightInterface::getInstance()->hasOverride();
// Not possible to assume M7WL should take precidence as OpenSim will send both
// bool bOverridden = M7WindlightInterface::getInstance()->hasOverride();
// If using server settings, update managers.
// if (getUseRegionSettings())
// [RLVa:KB] - Checked: 2011-08-29 (RLVa-1.4.1a) | Added: RLVa-1.4.1a
if (!bOverridden && (getUseRegionSettings()) && (LLWLParamManager::getInstance()->mAnimator.getIsRunning()) )
// [/RLVa:KB]
if (getUseRegionSettings())
{
updateManagersFromPrefs(mInterpNextChangeMessage);
}