aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-21 17:18:10 -0700
committerJacek Antonelli2010-06-19 02:40:56 -0500
commit8fed1b1c228e434dc9472cba47fce097e85c102a (patch)
tree9def7b7aaa4dee08e31468872f49c019c01bb229 /linden
parentApplied patch for LightShare viewer-side implementation. (diff)
downloadmeta-impy-8fed1b1c228e434dc9472cba47fce097e85c102a.zip
meta-impy-8fed1b1c228e434dc9472cba47fce097e85c102a.tar.gz
meta-impy-8fed1b1c228e434dc9472cba47fce097e85c102a.tar.bz2
meta-impy-8fed1b1c228e434dc9472cba47fce097e85c102a.tar.xz
Removed some more log spam from loading the water settings
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llwaterparammanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index 121be67..4a61b78 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -115,7 +115,7 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
115 // And repeat for user presets, note the user presets will modify any system presets already loaded 115 // And repeat for user presets, note the user presets will modify any system presets already loaded
116 116
117 std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", "")); 117 std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
118 LL_INFOS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL; 118 LL_DEBUGS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL;
119 119
120 found = true; 120 found = true;
121 while(found) 121 while(found)
@@ -150,7 +150,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
150 escaped_filename += ".xml"; 150 escaped_filename += ".xml";
151 151
152 std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename)); 152 std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
153 llinfos << "Loading water settings from " << pathName << llendl; 153 LL_DEBUGS2("AppInit", "Shaders") << "Loading water settings from " << pathName << LL_ENDL;
154 154
155 std::ifstream presetsXML; 155 std::ifstream presetsXML;
156 presetsXML.open(pathName.c_str()); 156 presetsXML.open(pathName.c_str());
@@ -159,7 +159,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
159 if(!presetsXML) 159 if(!presetsXML)
160 { 160 {
161 pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", escaped_filename); 161 pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", escaped_filename);
162 llinfos << "Loading User water setting from " << pathName << llendl; 162 LL_DEBUGS2("AppInit", "Shaders") << "Loading User water setting from " << pathName << LL_ENDL;
163 presetsXML.open(pathName.c_str()); 163 presetsXML.open(pathName.c_str());
164 } 164 }
165 165