From b3b30285126289f54b57bd42569bb0721e40e088 Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sun, 10 Oct 2010 22:10:33 +0100
Subject: 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
---
 linden/indra/newview/llvoground.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llvoground.cpp')

diff --git a/linden/indra/newview/llvoground.cpp b/linden/indra/newview/llvoground.cpp
index fe19e18..0ef0196 100644
--- a/linden/indra/newview/llvoground.cpp
+++ b/linden/indra/newview/llvoground.cpp
@@ -71,7 +71,7 @@ BOOL LLVOGround::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 }
 
 
-void LLVOGround::updateTextures(LLAgent &agent)
+void LLVOGround::updateTextures()
 {
 }
 
-- 
cgit v1.1