merge support-featurettes-snapshot-merge-2 for QAR-754, includes:

    * featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes

1 files changed, 3 insertions, 24 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e926e97f76..7fb9e57507 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -6438,20 +6438,9 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
 {
 	// We should only receive this message a single time.  Ignore subsequent AgentWearablesUpdates
 	// that may result from AgentWearablesRequest having been sent more than once. 
-	static BOOL first = TRUE;
-	if( first )
-	{
-		first = FALSE;
-	}
-	else
-	{
-		return;
-	}
-	
-	if (gNoRender)
-	{
-		return;
-	}
+	static bool first = true;
+	if (!first) return;
+	first = false;
 
 	LLUUID agent_id;
 	gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
@@ -6467,16 +6456,6 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
 			// Transitional state.  Avatars should always have at least their body parts (hair, eyes, shape and skin).
 			// The fact that they don't have any here (only a dummy is sent) implies that this account existed
 			// before we had wearables, or that the database has gotten messed up.
-			// Deal with this by creating new body parts.
-			//avatar->createStandardWearables();
-
-			// no, deal with it by noting that we need to choose a
-			// gender, but only if an initial outfit load isn't happening.
-			// This whole check (num_wearables < 4) can probably be deleted. JC
-			if (gInitialOutfit.empty())
-			{
-				gAgent.setGenderChosen(FALSE);
-			}
 			return;
 		}