aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwlparammanager.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llwlparammanager.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llwlparammanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 11ed43c..9f59947 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -39,7 +39,7 @@
39#include "llsliderctrl.h" 39#include "llsliderctrl.h"
40#include "llspinctrl.h" 40#include "llspinctrl.h"
41#include "llcheckboxctrl.h" 41#include "llcheckboxctrl.h"
42#include "llvieweruictrlfactory.h" 42#include "lluictrlfactory.h"
43#include "llviewercamera.h" 43#include "llviewercamera.h"
44#include "llcombobox.h" 44#include "llcombobox.h"
45#include "lllineeditor.h" 45#include "lllineeditor.h"
@@ -280,7 +280,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
280 if (shader->mShaderGroup == LLGLSLShader::SG_DEFAULT) 280 if (shader->mShaderGroup == LLGLSLShader::SG_DEFAULT)
281 { 281 {
282 shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV); 282 shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
283 shader->uniform3fv("camPosLocal", 1, gCamera->getOrigin().mV); 283 shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
284 } 284 }
285 285
286 else if (shader->mShaderGroup == LLGLSLShader::SG_SKY) 286 else if (shader->mShaderGroup == LLGLSLShader::SG_SKY)