diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 17:17:41 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 17:17:41 -0800 |
commit | 76990fab4f3c73ab1b2051421c52444de28f9d32 (patch) | |
tree | af43dee1ea44dfc900d56607e5195557a439fb3f /indra/newview/llattachmentsmgr.cpp | |
parent | 062a4388318de3f9142697d9043143a74ce3aaf8 (diff) | |
parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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) { |