diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-18 01:00:14 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-18 01:00:14 -0500 |
| commit | 1b01476dad70a01246df3456e40557bc0512d2d4 (patch) | |
| tree | 54f3a6666cc20f15f474b7b180adf09fb8f20c39 /indra | |
| parent | a451c9e83431c7d39ef912680bf9d7411c7a12d2 (diff) | |
Fix for annoying assert that gets triggered when your first login attempt fails.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 1b53348b43..4a9756bb88 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1123,7 +1123,10 @@ void LLVOAvatar::initClass() // Process XML data // avatar_skeleton.xml - llassert(!sAvatarSkeletonInfo); + if (sAvatarSkeletonInfo) + { //this can happen if a login attempt failed + delete sAvatarSkeletonInfo; + } sAvatarSkeletonInfo = new LLVOAvatarSkeletonInfo; if (!sAvatarSkeletonInfo->parseXml(sSkeletonXMLTree.getRoot())) { |