diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 06c52894a..5a18f0ea3 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2392,7 +2392,7 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came
 		gFocusMgr.setKeyboardFocus( NULL );
 		gFocusMgr.setMouseCapture( NULL );
 
-		LLVOAvatar::onCustomizeStart();
+		LLVOAvatarSelf::onCustomizeStart();
 
 		if (isAgentAvatarValid())
 		{
@@ -2418,10 +2418,11 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came
 				{
 					setAnimationDuration(gSavedSettings.getF32("ZoomTime"));
 				}
-				//gAgentAvatarp->invalidateAll();
-				//gAgentAvatarp->updateMeshTextures();
 			}
 			
+			gAgentAvatarp->invalidateAll();
+			gAgentAvatarp->updateMeshTextures();
+				
 			gAgentCamera.setFocusGlobal(LLVector3d::zero);
 		}
 	}
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 8a880d1bd..4cf6f3ac0 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -241,6 +241,8 @@ bool gAgentMovementCompleted = false;
 std::string SCREEN_HOME_FILENAME = "screen_home.bmp";
 std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
 
+LLPointer<LLViewerTexture> gStartTexture;
+
 //
 // Imported globals
 //
@@ -251,7 +253,7 @@ extern S32 gStartImageHeight;
 // local globals
 //
 
-LLPointer<LLViewerTexture> gStartTexture;
+
 
 static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;
@@ -3875,22 +3877,32 @@ void init_start_screen(S32 location_id)
 	else if(!start_image_bmp->load(temp_str) )
 	{
 		LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL;
-		return;
-	}
-
-	gStartImageWidth = start_image_bmp->getWidth();
-	gStartImageHeight = start_image_bmp->getHeight();
-
-	LLPointer<LLImageRaw> raw = new LLImageRaw;
-	if (!start_image_bmp->decode(raw, 0.0f))
-	{
-		LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
 		gStartTexture = NULL;
-		return;
+	}
+	else
+	{
+		gStartImageWidth = start_image_bmp->getWidth();
+		gStartImageHeight = start_image_bmp->getHeight();
+
+		LLPointer<LLImageRaw> raw = new LLImageRaw;
+		if (!start_image_bmp->decode(raw, 0.0f))
+		{
+			LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
+			gStartTexture = NULL;
+		}
+		else
+		{
+			raw->expandToPowerOfTwo();
+			gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE) ;
+		}
 	}
 
-	raw->expandToPowerOfTwo();
-	gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE) ;
+	if(gStartTexture.isNull())
+	{
+		gStartTexture = LLViewerTexture::sBlackImagep ;
+		gStartImageWidth = gStartTexture->getWidth() ;
+		gStartImageHeight = gStartTexture->getHeight() ;
+	}
 }
 
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 785ddc624..3cfdb64b2 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7831,34 +7831,6 @@ void LLVOAvatar::releaseComponentTextures()
 	}
 }
 
-
-
-
-
-//-----------------------------------------------------------------------------
-// static
-// onCustomizeStart()
-//-----------------------------------------------------------------------------
-void LLVOAvatar::onCustomizeStart()
-{
-	// We're no longer doing any baking or invalidating on entering
-	// appearance editing mode. Leaving function in place in case
-	// further changes require us to do something at this point - Nyx
-}
-
-//-----------------------------------------------------------------------------
-// static
-// onCustomizeEnd()
-//-----------------------------------------------------------------------------
-void LLVOAvatar::onCustomizeEnd()
-{
-	if (isAgentAvatarValid())
-	{
-		gAgentAvatarp->invalidateAll();
-		gAgentAvatarp->requestLayerSetUploads();
-	}
-}
-
 //static
 BOOL LLVOAvatar::teToColorParams( ETextureIndex te, U32 *param_name )
 {
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 7f718bfef..991f45353 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -711,13 +711,6 @@ public:
 	U32				getVisibilityRank()  const { return mVisibilityRank; } // unused
 	static S32 		sNumVisibleAvatars; // Number of instances of this class
 	static LLColor4 getDummyColor();
-	
-	//--------------------------------------------------------------------
-	// Customize
-	//--------------------------------------------------------------------
-public:
-	static void		onCustomizeStart();
-	static void		onCustomizeEnd();
 /**                    Appearance
  **                                                                            **
  *******************************************************************************/
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 471f5c371..f5767c378 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -569,7 +569,7 @@ BOOL LLVOAvatarSelf::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 	{
 		return TRUE;
 	}
-	if(!gNoRender)
+	/*if(!gNoRender)
 	{
 		//Emerald performs some force-bakes stuff here. Added it in because we noticed slow responses with client tag ident. -HgB
 		for(U8 i=0;i<getNumTEs();++i)
@@ -577,7 +577,7 @@ BOOL LLVOAvatarSelf::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			LLViewerTexture* te = getTEImage(i);
 			te->forceActive();
 		}
-	}
+	}*/
 	LLVOAvatar::idleUpdate(agent,world,time);
 	if(!gNoRender)
 		idleUpdateTractorBeam();