livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrapping all cases of LLPathingLib::getInstance in null pointer checks.

meow-7.2.2
Todd Stinson 2012-03-05 17:55:33 -08:00
parent f0e6ad509a
commit 8ad01dd79a
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -265,7 +265,10 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
mNavMeshZoneSlot.disconnect();
}
//mNavMeshZone.disable();
if (LLPathingLib::getInstance() != NULL)
{
mNavMeshZone.disable();
}
LLFloater::onClose(pIsAppQuitting);
setHeartBeat( false );

23
indra/newview/llpathfindingnavmeshzone.cpp
View File

@ -65,7 +65,10 @@ LLPathfindingNavMeshZone::navmesh_zone_slot_t LLPathfindingNavMeshZone::register
void LLPathfindingNavMeshZone::setCurrentRegionAsCenter()
{
llassert(LLPathingLib::getInstance() != NULL);
LLPathingLib::getInstance()->cleanupResidual();
if (LLPathingLib::getInstance() != NULL)
{
LLPathingLib::getInstance()->cleanupResidual();
}
mNavMeshLocations.clear();
LLViewerRegion *currentRegion = gAgent.getRegion();
const LLUUID &currentRegionUUID = currentRegion->getRegionID();
@ -91,8 +94,10 @@ void LLPathfindingNavMeshZone::disable()
mNavMeshSlot.disconnect();
}
llassert(LLPathingLib::getInstance() != NULL);
LLPathingLib::getInstance()->cleanupResidual();
if (LLPathingLib::getInstance() != NULL)
{
LLPathingLib::getInstance()->cleanupResidual();
}
mNavMeshLocations.clear();
}
@ -163,7 +168,11 @@ void LLPathfindingNavMeshZone::updateStatus()
else if (hasRequestCompleted)
{
zoneRequestStatus = kNavMeshZoneRequestCompleted;
LLPathingLib::getInstance()->stitchNavMeshes( gSavedSettings.getBOOL("EnableVBOForNavMeshVisualization") );
llassert(LLPathingLib::getInstance() != NULL);
if (LLPathingLib::getInstance() != NULL)
{
LLPathingLib::getInstance()->stitchNavMeshes( gSavedSettings.getBOOL("EnableVBOForNavMeshVisualization") );
}
}
else
{
@ -209,7 +218,11 @@ void LLPathfindingNavMeshZone::NavMeshLocation::handleNavMesh(LLPathfindingNavMe
llassert(!pNavMeshData.empty());
mHasNavMesh = true;
mNavMeshVersion = pNavMeshVersion;
LLPathingLib::getInstance()->extractNavMeshSrcFromLLSD(pNavMeshData, mDirection);
llassert(LLPathingLib::getInstance() != NULL);
if (LLPathingLib::getInstance() != NULL)
{
LLPathingLib::getInstance()->extractNavMeshSrcFromLLSD(pNavMeshData, mDirection);
}
}
}