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/llhudtext.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/llhudtext.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp index b17f8d7..7d9f7f9 100644 --- a/linden/indra/newview/llhudtext.cpp +++ b/linden/indra/newview/llhudtext.cpp | |||
| @@ -1116,8 +1116,6 @@ void LLHUDText::renderAllHUD() | |||
| 1116 | 1116 | ||
| 1117 | LLVertexBuffer::unbind(); | 1117 | LLVertexBuffer::unbind(); |
| 1118 | 1118 | ||
| 1119 | LLVertexBuffer::unbind(); // KL not entirely sure why but render pipeline has this twice? | ||
| 1120 | |||
| 1121 | LLGLState::checkStates(); | 1119 | LLGLState::checkStates(); |
| 1122 | LLGLState::checkTextureChannels(); | 1120 | LLGLState::checkTextureChannels(); |
| 1123 | LLGLState::checkClientArrays(); | 1121 | LLGLState::checkClientArrays(); |