aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwlparammanager.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:50 -0500
committerJacek Antonelli2008-08-15 23:45:50 -0500
commit2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch)
tree95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llwlparammanager.cpp
parentSecond Life viewer sources 1.20.6 (diff)
downloadmeta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/newview/llwlparammanager.cpp')
-rw-r--r--linden/indra/newview/llwlparammanager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 9f59947..9f23b37 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -111,7 +111,7 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
111 if(file_name != "") 111 if(file_name != "")
112 { 112 {
113 LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", file_name)); 113 LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", file_name));
114 llinfos << "Loading WindLight settings from " << path_name << llendl; 114 LL_INFOS2("AppInit", "Shaders") << "Loading WindLight settings from " << path_name << LL_ENDL;
115 115
116 llifstream presetsXML(path_name.c_str()); 116 llifstream presetsXML(path_name.c_str());
117 117
@@ -137,7 +137,7 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
137 else 137 else
138 { 138 {
139 LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", "")); 139 LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
140 llinfos << "Loading WindLight settings from " << path_name << llendl; 140 LL_INFOS2("AppInit", "Shaders") << "Loading WindLight settings from " << path_name << LL_ENDL;
141 141
142 //mParamList.clear(); 142 //mParamList.clear();
143 143
@@ -147,7 +147,7 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
147 std::string name; 147 std::string name;
148 found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false); 148 found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
149 149
150 llinfos << "name: " << name << llendl; 150 LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL;
151 151
152 // if we have one 152 // if we have one
153 if(found) 153 if(found)
@@ -162,7 +162,7 @@ void LLWLParamManager::loadPresets(const LLString& file_name)
162 std::string sky_name = unescaped_name.substr(0, unescaped_name.size() - 4); 162 std::string sky_name = unescaped_name.substr(0, unescaped_name.size() - 4);
163 163
164 LLString cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", name)); 164 LLString cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", name));
165 llinfos << "Loading sky from " << cur_path << llendl; 165 LL_DEBUGS2("AppInit", "Shaders") << "Loading sky from " << cur_path << LL_ENDL;
166 166
167 std::ifstream sky_xml(cur_path.c_str()); 167 std::ifstream sky_xml(cur_path.c_str());
168 if (sky_xml) 168 if (sky_xml)
@@ -299,7 +299,7 @@ void LLWLParamManager::propagateParameters(void)
299 LLVector4 sunDir; 299 LLVector4 sunDir;
300 LLVector4 moonDir; 300 LLVector4 moonDir;
301 301
302 // set the sun direction from mSunAngle and mEastAngle 302 // set the sun direction from SunAngle and EastAngle
303 F32 sinTheta = sin(mCurParams.getEastAngle()); 303 F32 sinTheta = sin(mCurParams.getEastAngle());
304 F32 cosTheta = cos(mCurParams.getEastAngle()); 304 F32 cosTheta = cos(mCurParams.getEastAngle());
305 305