diff options
author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llrender/llpostprocess.cpp | |
parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
Merge with 3.7.7-release
Diffstat (limited to 'indra/llrender/llpostprocess.cpp')
-rwxr-xr-x | indra/llrender/llpostprocess.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp index 4c36185b08..a95bb7027b 100755 --- a/indra/llrender/llpostprocess.cpp +++ b/indra/llrender/llpostprocess.cpp @@ -73,7 +73,7 @@ LLPostProcess::LLPostProcess(void) : /* Do nothing. Needs to be updated to use our current shader system, and to work with the move into llrender. std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME)); - LL_DEBUGS2("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL; + LL_DEBUGS("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL; llifstream effectsXML(pathName); @@ -160,7 +160,7 @@ void LLPostProcess::saveEffect(std::string const & effectName) mAllEffects[effectName] = tweaks; std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME)); - //llinfos << "Saving PostProcess Effects settings to " << pathName << llendl; + //LL_INFOS() << "Saving PostProcess Effects settings to " << pathName << LL_ENDL; llofstream effectsXML(pathName); |