diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
| commit | 7590704e0e93b48f897c47dba07916efebd95274 (patch) | |
| tree | e38f863dc5a72bc078d362a9fee214e018d0ca05 /indra/newview/llviewerdisplay.cpp | |
| parent | 940e070326e920b6314c7153f687d9985ad763ed (diff) | |
| parent | 7efc0fbb4fd912d59a38a4d5653f1dc12c3876b1 (diff) | |
Merge with Tip
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 4d559e2ca7..7b9b12108d 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -45,7 +45,7 @@ #include "lldynamictexture.h" #include "lldrawpoolalpha.h" #include "llfeaturemanager.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llhudmanager.h" #include "llimagebmp.h" #include "llmemory.h" @@ -404,7 +404,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) if( arrival_fraction > 1.f ) { arrival_fraction = 1.f; - LLFirstUse::useTeleport(); + //LLFirstUse::useTeleport(); gAgent.setTeleportState( LLAgent::TELEPORT_NONE ); } gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel")); |