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/llvoground.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/llvoground.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | 73 | ||
| 74 | void LLVOGround::updateTextures(LLAgent &agent) | 74 | void LLVOGround::updateTextures() |
| 75 | { | 75 | { |
| 76 | } | 76 | } |
| 77 | 77 | ||