summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNicky <none@none>2012-07-13 13:37:18 +0200
committerNicky <none@none>2012-07-13 13:37:18 +0200
commit60393abdad98c61d9cb01d004e3d69bd8d34bfda (patch)
tree9c0a23e80ad47751c6ebebd5af22ba33d65967cc /indra
parent85025ffc7be40c0953ca8905f149701b4b8f568f (diff)
Crashfix: In LLAttachmentsMgr::onIdle make sure we've a valid region before dereferencing it.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llattachmentsmgr.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index c9543988a6..ea0b8f00a4 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -62,6 +62,12 @@ void LLAttachmentsMgr::onIdle(void *)
void LLAttachmentsMgr::onIdle()
{
+ // Make sure we got a region before trying anything else
+ if( !gAgent.getRegion() )
+ {
+ return;
+ }
+
S32 obj_count = mPendingAttachments.size();
if (obj_count == 0)
{