From 29a0f7cfdd33e8d18ad5d932eefa67332d5b5ed3 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 9 Jul 2009 17:50:25 +0200
Subject: looks like working now

	modified:   linden/indra/newview/llchatbar.cpp
	modified:   linden/indra/newview/llviewerwindow.cpp
	modified:   linden/indra/newview/llvoavatar.cpp
---
 linden/indra/newview/llvoavatar.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llvoavatar.cpp')

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3d2523e..999a609 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -691,7 +691,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);
 	
@@ -1807,6 +1811,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
 	//-------------------------------------------------------------------------
@@ -2174,9 +2182,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));
 				
-- 
cgit v1.1