Merge branch 'gridmanager' into next

1 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 431ef96..4ab14f4 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -698,7 +698,11 @@ LLVOAvatar::LLVOAvatar(
         mTexEyeColor( NULL ),
         mNeedsSkin(FALSE),
         mUpdatePeriod(1),
-        mFullyLoadedInitialized(FALSE)
+//      mFullyLoadedInitialized(FALSE)
+        mPreviousFullyLoaded(FALSE),
+        mVisibleChat( FALSE ),
+        mFullyLoadedInitialized(FALSE),
+        mFullyLoaded(FALSE)
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
         
@@ -1814,6 +1818,10 @@ BOOL LLVOAvatar::buildSkeleton(LLVOAvatarSkeletonInfo *info)
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
         
+        //this can get called with null info on startup sometimes
+        if (!info)
+                return FALSE;
+
         //-------------------------------------------------------------------------
         // allocate joints
         //-------------------------------------------------------------------------
@@ -2194,9 +2202,10 @@ void LLVOAvatar::buildCharacter()
                                 LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
                                                                                                                           NULL, &object_selected_and_point_valid,
                                                                                                                           &attach_label, attachment);
+if (item){
                                 item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
                                 gAttachSubMenu->append(item);
-
+}
                                 gDetachSubMenu->append(new LLMenuItemCallGL(attachment->getName(), 
                                         &handle_detach_from_avatar, object_attached, &detach_label, attachment));