Second Life viewer sources 1.21.0-RC

1 files changed, 13 insertions, 6 deletions

diff --git a/linden/indra/newview/llpostprocess.cpp b/linden/indra/llrender/llpostprocess.cpp
index 7ee7100..c884951 100644
--- a/linden/indra/newview/llpostprocess.cpp
+++ b/linden/indra/llrender/llpostprocess.cpp
@@ -29,9 +29,8 @@
  * $/LicenseInfo$
  */
 
-#include "llviewerprecompiledheaders.h"
+#include "linden_common.h"
 
-#include "pipeline.h"
 #include "llpostprocess.h"
 #include "llglslshader.h"
 #include "llsdserialize.h"
@@ -58,10 +57,11 @@ LLPostProcess::LLPostProcess(void) :
                                         mAllEffects(LLSD::emptyMap()),
                                         screenW(1), screenH(1)
 {
-        LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
+        /*  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;
 
-        llifstream effectsXML(pathName.c_str());
+        llifstream effectsXML(pathName);
 
         if (effectsXML)
         {
@@ -105,6 +105,7 @@ LLPostProcess::LLPostProcess(void) :
         }
 
         setSelectedEffect("default");
+        */
 }
 
 LLPostProcess::~LLPostProcess(void)
@@ -143,16 +144,18 @@ void LLPostProcess::setSelectedEffect(std::string const & effectName)
 
 void LLPostProcess::saveEffect(std::string const & effectName)
 {
+        /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
         mAllEffects[effectName] = tweaks;
 
-        LLString pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
+        std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
         //llinfos << "Saving PostProcess Effects settings to " << pathName << llendl;
 
-        llofstream effectsXML(pathName.c_str());
+        llofstream effectsXML(pathName);
 
         LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
 
         formatter->format(mAllEffects, effectsXML);
+        */
 }
 
 void LLPostProcess::apply(unsigned int width, unsigned int height)
@@ -213,6 +216,7 @@ void LLPostProcess::applyShaders(void)
 
 void LLPostProcess::applyColorFilterShader(void)
 {       
+        /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
         gPostColorFilterProgram.bind();
 
         gGL.getTexUnit(0)->activate();
@@ -240,6 +244,7 @@ void LLPostProcess::applyColorFilterShader(void)
         /// Draw a screen space quad
         drawOrthoQuad(screenW, screenH, QUAD_NORMAL);
         gPostColorFilterProgram.unbind();
+        */
 }
 
 void LLPostProcess::createColorFilterShader(void)
@@ -255,6 +260,7 @@ void LLPostProcess::createColorFilterShader(void)
 
 void LLPostProcess::applyNightVisionShader(void)
 {       
+        /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
         gPostNightVisionProgram.bind();
 
         gGL.getTexUnit(0)->activate();
@@ -287,6 +293,7 @@ void LLPostProcess::applyNightVisionShader(void)
         drawOrthoQuad(screenW, screenH, QUAD_NOISE);
         gPostNightVisionProgram.unbind();
         gGL.getTexUnit(0)->activate();
+        */
 }
 
 void LLPostProcess::createNightVisionShader(void)