diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-08-17 08:07:15 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-08-17 08:07:15 -0700 |
| commit | efdcf045b064335aa180f03bae58916af19e2169 (patch) | |
| tree | 4ca0be04bf1688b728b40be0d6b4221956127918 /indra/newview/llviewerdisplay.cpp | |
| parent | 56298eed3d8ae586ab2ae4c7b8dcf53eeede7394 (diff) | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
Merged in from viewer-development.
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index fc5a2809b8..d58ee05fb6 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -436,6 +436,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLAgent::sTeleportProgressMessages["arriving"]); gTextureList.mForceResetTextureStats = TRUE; gAgentCamera.resetView(TRUE, TRUE); + break; case LLAgent::TELEPORT_ARRIVING: @@ -779,7 +780,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLImageGL::deleteDeadTextures(); stop_glerror(); }*/ - } + } LLGLState::checkStates(); LLGLState::checkClientArrays(); |