diff options
| author | prep <prep@lindenlab.com> | 2012-06-19 15:09:22 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-19 15:09:22 -0400 |
| commit | 6711e6584aa0aa5f17f76a557524725857fbf2ba (patch) | |
| tree | 0f2b0511378d09cc06cccad2b4ee5bf3af5daea1 /indra/newview/llviewerdisplay.cpp | |
| parent | eb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff) | |
path-722: handling the case where region entry or teleporting would cause the rebake button to be drawn ontop of splash screen.
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 0adb187dd2..aeb09e6808 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -77,6 +77,7 @@ #include "llwlparammanager.h" #include "llwaterparammanager.h" #include "llpostprocess.h" +#include "llpathfindingmanager.h" extern LLPointer<LLViewerTexture> gStartTexture; @@ -391,13 +392,15 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gViewerWindow->setProgressPercent(0); gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED ); gAgent.setTeleportMessage( - LLAgent::sTeleportProgressMessages["requesting"]); + LLAgent::sTeleportProgressMessages["requesting"]); + LLPathfindingManager::getInstance()->hideNavMeshRebakePanel(); break; case LLAgent::TELEPORT_REQUESTED: // Waiting for source simulator to respond gViewerWindow->setProgressPercent( llmin(teleport_percent, 37.5f) ); - gViewerWindow->setProgressString(message); + gViewerWindow->setProgressString(message); + LLPathfindingManager::getInstance()->hideNavMeshRebakePanel(); break; case LLAgent::TELEPORT_MOVING: @@ -415,7 +418,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gAgent.setTeleportMessage( LLAgent::sTeleportProgressMessages["arriving"]); gTextureList.mForceResetTextureStats = TRUE; - gAgentCamera.resetView(TRUE, TRUE); + gAgentCamera.resetView(TRUE, TRUE); + break; case LLAgent::TELEPORT_ARRIVING: @@ -449,7 +453,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) case LLAgent::TELEPORT_NONE: // No teleport in progress gViewerWindow->setShowProgress(FALSE); - gTeleportDisplay = FALSE; + gTeleportDisplay = FALSE; + LLPathfindingManager::getInstance()->requestGetAgentState(); break; } } |