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

Restore LightShare compatibility

Browse Source
This commit is contained in:
Siana Gearz
2012-02-05 13:52:50 +01:00
parent 7b6ff27c4b
commit 859e2701f2
4 changed files with 23 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llenvmanager.cpp
View File

@@ -42,6 +42,7 @@
#include "llwlhandlers.h"
#include "llwlparammanager.h"
//#include "kcwlinterface.h"
#include "m7wlinterface.h"
#include "rlvhandler.h"
std::string LLEnvPrefs::getWaterPresetName() const
@@ -492,7 +493,7 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content)
LLWLParamManager::getInstance()->refreshRegionPresets();
// Use the region settings if parcel settings didnt override it already -KC
if (true /*KCWindlightInterface::instance().haveParcelOverride(new_settings)*/)
if (!M7WindlightInterface::getInstance()->hasOverride())
{
// If using server settings, update managers.
if (getUseRegionSettings())