diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-18 01:02:25 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-18 01:02:25 -0500 |
| commit | 27fb647fd1f1ad3280a0c848e2fcb3963a9e40ca (patch) | |
| tree | 3de25c89389ae94e7533393aa0b32896f35e2225 /indra/newview/llvoavatar.cpp | |
| parent | f0369f3d2ceb39dcfb4eee06a12c4a8393cb026f (diff) | |
| parent | 15235061e8a8f64dd94640d27eadfce23ccb76f6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -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())) { |