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

Fix LightShare annoyance for people who don't know what LightShare is

Browse Source
This commit is contained in:
Siana Gearz
2012-09-08 08:12:13 +02:00
parent 04bb15a108
commit f1a5fb6b62
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llenvmanager.cpp
View File

@@ -494,11 +494,13 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
// Load region sky presets.
LLWLParamManager::instance().refreshRegionPresets();
// Not possible to assume M7WL should take precidence as OpenSim will send both
// bool bOverridden = M7WindlightInterface::getInstance()->hasOverride();
bool bOverridden = M7WindlightInterface::getInstance()->hasOverride();
// If using server settings, update managers.
if (getUseRegionSettings())
// 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]
{
updateManagersFromPrefs(mInterpNextChangeMessage);
}