Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-06-08 14:19:43 -05:00
parent 9746f7cc27 5d87098bd0
commit b691e2b286
86 changed files with 1690 additions and 2420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llwaterparammanager.cpp
View File

@@ -39,6 +39,7 @@
#include "pipeline.h"
#include "llsky.h"
#include "lldiriterator.h"
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "llcheckboxctrl.h"
@@ -94,10 +95,11 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
LL_INFOS2("AppInit", "Shaders") << "Loading Default water settings from " << path_name << LL_ENDL;
bool found = true;
LLDirIterator app_settings_iter(path_name, "*.xml");
while(found)
{
std::string name;
found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
found = app_settings_iter.next(name);
if(found)
{
@@ -120,10 +122,11 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
LL_INFOS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL;
found = true;
LLDirIterator user_settings_iter(path_name2, "*.xml");
while(found)
{
std::string name;
found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
found = user_settings_iter.next(name);
if(found)
{
name=name.erase(name.length()-4);