diff options
| author | Robin Cornelius | 2010-10-10 22:10:33 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 22:10:33 +0100 |
| commit | b3b30285126289f54b57bd42569bb0721e40e088 (patch) | |
| tree | f4aaccb98d1a835c4ea376ec2803fc410a704052 /linden/indra/newview/llappviewer.cpp | |
| parent | Merge branch 'mccabe-plugins' into plugins_merge (diff) | |
| download | meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.zip meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.gz meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.bz2 meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.xz | |
Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"
This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.
Conflicts:
linden/indra/newview/llsurface.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 3a3f51b..9fad9f1 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
| @@ -448,7 +448,7 @@ static void settings_modify() | |||
| 448 | LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4] | 448 | LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4] |
| 449 | gDebugGL = gSavedSettings.getBOOL("RenderDebugGL"); | 449 | gDebugGL = gSavedSettings.getBOOL("RenderDebugGL"); |
| 450 | gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline"); | 450 | gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline"); |
| 451 | // gAuditTexture = gSavedSettings.getBOOL("AuditTexture"); | 451 | gAuditTexture = gSavedSettings.getBOOL("AuditTexture"); |
| 452 | #if LL_VECTORIZE | 452 | #if LL_VECTORIZE |
| 453 | if (gSysCPU.hasAltivec()) | 453 | if (gSysCPU.hasAltivec()) |
| 454 | { | 454 | { |