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/llagent.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/llagent.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index bfaa4ad..1b2c8e1 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
@@ -223,7 +223,6 @@ LLAgent gAgent; | |||
223 | // Statics | 223 | // Statics |
224 | // | 224 | // |
225 | BOOL LLAgent::sPhantom = FALSE; | 225 | BOOL LLAgent::sPhantom = FALSE; |
226 | BOOL LLAgent::sDebugDisplayTarget = FALSE; | ||
227 | 226 | ||
228 | const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f; | 227 | const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f; |
229 | 228 | ||
@@ -6624,7 +6623,7 @@ void LLAgent::saveWearable( EWearableType type, BOOL send_update ) | |||
6624 | return; | 6623 | return; |
6625 | } | 6624 | } |
6626 | 6625 | ||
6627 | // getAvatarObject()->wearableUpdated( type ); | 6626 | getAvatarObject()->wearableUpdated( type ); |
6628 | 6627 | ||
6629 | if( send_update ) | 6628 | if( send_update ) |
6630 | { | 6629 | { |