diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-12-03 14:35:45 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-12-03 14:35:45 -0500 |
| commit | 3be13024c51a714aa94ac55c2a972d3f523024f9 (patch) | |
| tree | b9c5c477da9ca20a9cf4e202bad84a5105a33a4a /indra/newview/llattachmentsmgr.cpp | |
| parent | 5c245e941ace3f52dfa3539c473e2c02f207d8a3 (diff) | |
| parent | f0a11b1590a8d52281683275f836ac347ccc510f (diff) | |
merge
Diffstat (limited to 'indra/newview/llattachmentsmgr.cpp')
| -rw-r--r-- | indra/newview/llattachmentsmgr.cpp | 6 |
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) { |