From d4d0520f38f59c4f60da098da9c2217ca6e45d65 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 20 Sep 2017 14:29:36 -0700
Subject: Cleanup inside GLSLShader for uniform mapping.

---
 indra/newview/CMakeLists.txt       | 2 ++
 indra/newview/llwlparammanager.cpp | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f3811fffe7..72339b2f51 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -181,6 +181,7 @@ set(viewer_SOURCE_FILES
     lldrawpoolwlsky.cpp
     lldynamictexture.cpp
     llemote.cpp
+    llenvironment.cpp
     llenvmanager.cpp
     llestateinfomodel.cpp
     lleventnotifier.cpp
@@ -803,6 +804,7 @@ set(viewer_HEADER_FILES
     lldrawpoolwlsky.h
     lldynamictexture.h
     llemote.h
+    llenvironment.h
     llenvmanager.h
     llestateinfomodel.h
     lleventnotifier.h
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index 980fe96c2b..41783c8667 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -59,6 +59,8 @@
 #include "curl/curl.h"
 #include "llstreamtools.h"
 
+#include "llenvironment.h"
+
 LLWLParamManager::LLWLParamManager() :
 
 	//set the defaults for the controls
@@ -317,8 +319,9 @@ bool LLWLParamManager::loadPreset(const std::string& path)
 		addParamSet(key, params_data);
 	}
 
-    //*RIDER temp code testing conversion old preset to new settings.
-    //LLSettingsSky::ptr_t test = LLSettingsSky::buildFromLegacyPreset(name, params_data);
+    //*LAPRAS temp code testing conversion old preset to new settings.
+    LLSettingsSky::ptr_t test = LLSettingsSky::buildFromLegacyPreset(name, params_data);
+    LLEnvironment::instance().addSky(test);
     //test->exportSettings(name);
 
 	return true;
-- 
cgit v1.2.3