Broken: relog sometimes works once; fixed inventory and avatar not ruthed anymore.

	deleted:    Imprudence.log
	modified:   linden/indra/newview/llagent.cpp
	modified:   linden/indra/newview/llappviewer.cpp
	modified:   linden/indra/newview/llinventorymodel.cpp
	modified:   linden/indra/newview/llinventorymodel.h
	modified:   linden/indra/newview/llinventoryview.cpp
	modified:   linden/indra/newview/llviewerjointattachment.h
	modified:   linden/indra/newview/llviewermenu.cpp
	deleted:    mAttachedObject.diff.txt
	deleted:    meerkat-llmenugl.diff.txt
	deleted:    meerkat-message.diff.txt
	deleted:    meerkat-pipeline.cpp.diff.txt
	deleted:    meerkat-voice.diff.txt
	deleted:    stack_trace.log

1 files changed, 12 insertions, 0 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 5f0a875..e6ae7b5 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -466,6 +466,10 @@ void LLAgent::init()
 //-----------------------------------------------------------------------------
 void LLAgent::cleanup()
 {
+        mInitialized = FALSE;
+        mWearablesLoaded = FALSE;
+        mShowAvatar = TRUE;
+
         setSitCamera(LLUUID::null);
         mAvatarObject = NULL;
         mLookAt = NULL;
@@ -6592,11 +6596,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 );