summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2012-03-30 15:45:54 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2012-03-30 15:45:54 +0300
commiteb9e6e295d058a1f331f04f89cffd4898b1561e7 (patch)
tree7a4aec84b87cf2e0d69dfa01ac6c8f1ec3866c50 /indra/newview
parent886d743a18cf57ca2ebd7ccf6d9c26afc4293140 (diff)
MAINT-813 FIXED Potential fix for a crash at LLViewerRegion::getPosGlobalFromRegion.
As far as I can tell, if login fails with the "Region has begun the logout process" message, gAgentAvatarp gets destroyed, which leads to the crash. Adding a check that should prevent it (could not reproduce to make sure).
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerobject.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 37fb77a10a..e590f29a9a 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -143,7 +143,10 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
}
else
{
- gAgentAvatarp->updateRegion(regionp);
+ if (isAgentAvatarValid())
+ {
+ gAgentAvatarp->updateRegion(regionp);
+ }
}
res = gAgentAvatarp;
}