summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-26 20:03:39 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-26 20:03:39 -0700
commit6c03d32e0d384ab452115151325133e2e35e0ea1 (patch)
treee1863275e266fe82e54d12467fbf6616818cb210
parent773ce219c6317dc753369fa280d5d7f6c4b23550 (diff)
EXT-1548 - Fix for Crash on restart of a region
-rw-r--r--indra/newview/llviewerparcelmgr.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 77b023f6dd..aa0987aa7d 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -843,8 +843,11 @@ void LLViewerParcelMgr::renderParcelCollision()
if (mRenderCollision && gSavedSettings.getBOOL("ShowBanLines"))
{
LLViewerRegion* regionp = gAgent.getRegion();
- BOOL use_pass = mCollisionParcel->getParcelFlag(PF_USE_PASS_LIST);
- renderCollisionSegments(mCollisionSegments, use_pass, regionp);
+ if (regionp)
+ {
+ BOOL use_pass = mCollisionParcel->getParcelFlag(PF_USE_PASS_LIST);
+ renderCollisionSegments(mCollisionSegments, use_pass, regionp);
+ }
}
}