diff options
| author | angela <angela@lindenlab.com> | 2010-01-14 11:40:58 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-14 11:40:58 +0800 |
| commit | 82b073be87e332b7653e442ef3fd84af7376da8e (patch) | |
| tree | 87ef0a697a51b2f62d936d022a86b5aab2043fe9 /indra/newview/llviewerdisplay.cpp | |
| parent | 01c65e891d477b2f162cb277a2b06a6d3a4a0e9f (diff) | |
| parent | 6a2b10d869a1598b3db17b62bc7f5f9bb8dae39e (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
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")); |