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.h | |
| 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 'linden/indra/newview/llvoground.h')
| -rw-r--r-- | linden/indra/newview/llvoground.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoground.h b/linden/indra/newview/llvoground.h index f485bd0..b58ebae 100644 --- a/linden/indra/newview/llvoground.h +++ b/linden/indra/newview/llvoground.h | |||
| @@ -51,7 +51,7 @@ public: | |||
| 51 | 51 | ||
| 52 | // Graphical stuff for objects - maybe broken out into render class | 52 | // Graphical stuff for objects - maybe broken out into render class |
| 53 | // later? | 53 | // later? |
| 54 | /*virtual*/ void updateTextures(LLAgent &agent); | 54 | /*virtual*/ void updateTextures(); |
| 55 | /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); | 55 | /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); |
| 56 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); | 56 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); |
| 57 | 57 | ||