Second Life viewer sources 1.21.0-RC

1 files changed, 21 insertions, 17 deletions

diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index fb09fd8..f4f1163 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -33,6 +33,8 @@
 
 #include "llwaterparammanager.h"
 
+#include "llrender.h"
+
 #include "pipeline.h"
 #include "llsky.h"
 
@@ -84,9 +86,9 @@ LLWaterParamManager::~LLWaterParamManager()
 {
 }
 
-void LLWaterParamManager::loadAllPresets(const LLString& file_name)
+void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 {
-        LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
+        std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
         LL_INFOS2("AppInit", "Shaders") << "Loading water settings from " << path_name << LL_ENDL;
 
         //mParamList.clear();
@@ -111,10 +113,10 @@ void LLWaterParamManager::loadAllPresets(const LLString& file_name)
                         // not much error checking here since we're getting rid of this
                         std::string water_name = unescaped_name.substr(0, unescaped_name.size() - 4);
                 
-                        LLString cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", name));
+                        std::string cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", name));
                         LL_DEBUGS2("AppInit", "Shaders") << "Loading water from " << cur_path << LL_ENDL;
                         
-                        std::ifstream water_xml(cur_path.c_str());
+                        llifstream water_xml(cur_path);
                         if (water_xml)
                         {
                                 LLSD water_data(LLSD::emptyMap());
@@ -122,12 +124,13 @@ void LLWaterParamManager::loadAllPresets(const LLString& file_name)
                                 parser->parse(water_xml, water_data, LLSDSerialize::SIZE_UNLIMITED);
 
                                 addParamSet(water_name, water_data);
+                                water_xml.close();
                         }
                 }
         }
 }
 
-void LLWaterParamManager::loadPreset(const LLString & name)
+void LLWaterParamManager::loadPreset(const std::string & name)
 {
         // bugfix for SL-46920: preventing filenames that break stuff.
         char * curl_str = curl_escape(name.c_str(), name.size());
@@ -140,7 +143,7 @@ void LLWaterParamManager::loadPreset(const LLString & name)
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
         llinfos << "Loading water settings from " << pathName << llendl;
 
-        std::ifstream presetsXML(pathName.c_str());
+        llifstream presetsXML(pathName);
 
         if (presetsXML)
         {
@@ -159,6 +162,7 @@ void LLWaterParamManager::loadPreset(const LLString & name)
                 {
                         setParamSet(name, paramsData);
                 }
+                presetsXML.close();
         } 
         else 
         {
@@ -171,7 +175,7 @@ void LLWaterParamManager::loadPreset(const LLString & name)
         propagateParameters();
 }
 
-void LLWaterParamManager::savePreset(const LLString & name)
+void LLWaterParamManager::savePreset(const std::string & name)
 {
         // bugfix for SL-46920: preventing filenames that break stuff.
         char * curl_str = curl_escape(name.c_str(), name.size());
@@ -189,7 +193,7 @@ void LLWaterParamManager::savePreset(const LLString & name)
         paramsData = mParamList[name].getAll();
 
         // write to file
-        std::ofstream presetsXML(pathName.c_str());
+        llofstream presetsXML(pathName);
         LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
         formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
         presetsXML.close();
@@ -203,9 +207,9 @@ void LLWaterParamManager::propagateParameters(void)
         // bind the variables only if we're using shaders
         if(gPipeline.canUseVertexShaders())
         {
-                LLShaderMgr::shader_iter shaders_iter, end_shaders;
-                end_shaders = LLShaderMgr::endShaders();
-                for(shaders_iter = LLShaderMgr::beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
+                LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
+                end_shaders = LLViewerShaderMgr::instance()->endShaders();
+                for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
                 {
                         if (shaders_iter->mProgramObject != 0
                                 && shaders_iter->mShaderGroup == LLGLSLShader::SG_WATER)
@@ -227,7 +231,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 {
         if (shader->mShaderGroup == LLGLSLShader::SG_WATER)
         {
-                shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV);
+                shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV);
                 shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
                 shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV);
                 shader->uniform4fv("waterPlane", 1, mWaterPlane.mV);
@@ -287,9 +291,9 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
                 sunMoonDir.normVec();
                 mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
 
-                LLShaderMgr::shader_iter shaders_iter, end_shaders;
-                end_shaders = LLShaderMgr::endShaders();
-                for(shaders_iter = LLShaderMgr::beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
+                LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
+                end_shaders = LLViewerShaderMgr::instance()->endShaders();
+                for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
                 {
                         if (shaders_iter->mProgramObject != 0
                                 && shaders_iter->mShaderGroup == LLGLSLShader::SG_WATER)
@@ -386,7 +390,7 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 
         if(delete_from_disk)
         {
-                LLString path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
+                std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
                 
                 // use full curl escaped name
                 char * curl_str = curl_escape(name.c_str(), name.size());
@@ -425,7 +429,7 @@ LLWaterParamManager * LLWaterParamManager::instance()
         {
                 sInstance = new LLWaterParamManager();
 
-                sInstance->loadAllPresets("");
+                sInstance->loadAllPresets(LLStringUtil::null);
 
                 sInstance->getParamSet("Default", sInstance->mCurParams);
         }