From 5b5ee18f6fb1bb6c5ef8590f933014069c5613a9 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 24 Apr 2017 19:55:55 +0300 Subject: MAINT-7330 Fixed circularity of environmental singletons --- indra/newview/llsky.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llsky.cpp') diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp index a961f0e3b4..7a292fe0ef 100644 --- a/indra/newview/llsky.cpp +++ b/indra/newview/llsky.cpp @@ -51,6 +51,7 @@ #include "llvosky.h" #include "llcubemap.h" #include "llviewercontrol.h" +#include "llenvmanager.h" #include "llvowlsky.h" @@ -340,6 +341,8 @@ void LLSky::init(const LLVector3 &sun_direction) LLGLState::checkTextureChannels(); mUpdatedThisFrame = TRUE; + + LLEnvManagerNew::instance().usePrefs(); //inits day cycles and water } -- cgit v1.2.3 From 0dcb423cf3dc42e11621eece972801b036657e91 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 25 Apr 2017 17:48:34 +0300 Subject: MAINT-7145 Eliminate LLSingleton circular references --- indra/newview/llsky.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llsky.cpp') diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp index 7a292fe0ef..3ef89ba920 100644 --- a/indra/newview/llsky.cpp +++ b/indra/newview/llsky.cpp @@ -341,8 +341,6 @@ void LLSky::init(const LLVector3 &sun_direction) LLGLState::checkTextureChannels(); mUpdatedThisFrame = TRUE; - - LLEnvManagerNew::instance().usePrefs(); //inits day cycles and water } -- cgit v1.2.3