Merge commit 'b3c39a47e76f595fd953d9ccffc58b0dfb8359db' into armin-1.2.0-next

1 files changed, 12 insertions, 0 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index d73ddb6..edcb82c 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -467,6 +467,10 @@ void LLAgent::init()
 //-----------------------------------------------------------------------------
 void LLAgent::cleanup()
 {
+        mInitialized = FALSE;
+        mWearablesLoaded = FALSE;
+        mShowAvatar = TRUE;
+
         setSitCamera(LLUUID::null);
         mAvatarObject = NULL;
         mLookAt = NULL;
@@ -6674,11 +6678,19 @@ BOOL LLAgent::isWearingItem( const LLUUID& item_id )
 // static
 void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void** user_data )
 {
+        if (gNoRender)
+        {
+                return;
+        }
+
         // We should only receive this message a single time.  Ignore subsequent AgentWearablesUpdates
         // that may result from AgentWearablesRequest having been sent more than once. 
+        // If we do this, then relogging won't work. - Gigs
+        /*
         static bool first = true;
         if (!first) return;
         first = false;
+        */
 
         LLUUID agent_id;
         gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );