aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r--linden/indra/newview/llagent.cpp12
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()
466//----------------------------------------------------------------------------- 466//-----------------------------------------------------------------------------
467void LLAgent::cleanup() 467void LLAgent::cleanup()
468{ 468{
469 mInitialized = FALSE;
470 mWearablesLoaded = FALSE;
471 mShowAvatar = TRUE;
472
469 setSitCamera(LLUUID::null); 473 setSitCamera(LLUUID::null);
470 mAvatarObject = NULL; 474 mAvatarObject = NULL;
471 mLookAt = NULL; 475 mLookAt = NULL;
@@ -6592,11 +6596,19 @@ BOOL LLAgent::isWearingItem( const LLUUID& item_id )
6592// static 6596// static
6593void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void** user_data ) 6597void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void** user_data )
6594{ 6598{
6599 if (gNoRender)
6600 {
6601 return;
6602 }
6603
6595 // We should only receive this message a single time. Ignore subsequent AgentWearablesUpdates 6604 // We should only receive this message a single time. Ignore subsequent AgentWearablesUpdates
6596 // that may result from AgentWearablesRequest having been sent more than once. 6605 // that may result from AgentWearablesRequest having been sent more than once.
6606 // If we do this, then relogging won't work. - Gigs
6607 /*
6597 static bool first = true; 6608 static bool first = true;
6598 if (!first) return; 6609 if (!first) return;
6599 first = false; 6610 first = false;
6611 */
6600 6612
6601 LLUUID agent_id; 6613 LLUUID agent_id;
6602 gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); 6614 gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );