diff options
| author | prep <prep@lindenlab.com> | 2012-06-19 15:34:24 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-19 15:34:24 -0400 |
| commit | c839e769e8706d7a7cb1b031b0d9dda9d5224e48 (patch) | |
| tree | 812d54b88e6d066ff24e5fda9654c1a1c1b2927f /indra | |
| parent | c06d46b56788cccc778682cbd7cc37cbbca7b7cc (diff) | |
Instance checks before using llpathfindingmanager.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index aeb09e6808..7249f72c64 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -393,14 +393,14 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED ); gAgent.setTeleportMessage( LLAgent::sTeleportProgressMessages["requesting"]); - LLPathfindingManager::getInstance()->hideNavMeshRebakePanel(); + if ( LLPathfindingManager::getInstance() ) { LLPathfindingManager::getInstance()->hideNavMeshRebakePanel(); } break; case LLAgent::TELEPORT_REQUESTED: // Waiting for source simulator to respond gViewerWindow->setProgressPercent( llmin(teleport_percent, 37.5f) ); gViewerWindow->setProgressString(message); - LLPathfindingManager::getInstance()->hideNavMeshRebakePanel(); + if ( LLPathfindingManager::getInstance() ) { LLPathfindingManager::getInstance()->hideNavMeshRebakePanel(); } break; case LLAgent::TELEPORT_MOVING: @@ -454,7 +454,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) // No teleport in progress gViewerWindow->setShowProgress(FALSE); gTeleportDisplay = FALSE; - LLPathfindingManager::getInstance()->requestGetAgentState(); + if ( LLPathfindingManager::getInstance() ) { LLPathfindingManager::getInstance()->requestGetAgentState(); } break; } } |