diff options
| author | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
| commit | 536e38ad51b89808f26d8e3cd107fe093862d22a (patch) | |
| tree | 230159ae9e319f5c419f1a643177b2bbb17d52c5 /indra/newview/llwaterparammanager.cpp | |
| parent | 760adead96e62cab8f9cdacc6469773a87dfbc1a (diff) | |
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
| -rw-r--r-- | indra/newview/llwaterparammanager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 3661be500b..136ffe607d 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -154,7 +154,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate) std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename)); llinfos << "Loading water settings from " << pathName << llendl; - std::ifstream presetsXML; + llifstream presetsXML; presetsXML.open(pathName.c_str()); // That failed, try loading from the users area instead. @@ -162,7 +162,8 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate) { pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", escaped_filename); llinfos << "Loading User water setting from " << pathName << llendl; - presetsXML.open(pathName.c_str()); + presetsXML.clear(); + presetsXML.open(pathName.c_str()); } if (presetsXML) @@ -279,8 +280,6 @@ void LLWaterParamManager::update(LLViewerCamera * cam) waterfloater->syncMenu(); } - stop_glerror(); - // only do this if we're dealing with shaders if(gPipeline.canUseVertexShaders()) { |