From 7e3007b63521c4b0c5bbad1c3964a557fc526ce2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:57 -0500
Subject: Second Life viewer sources 1.20.11

---
 linden/indra/newview/llagent.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llagent.cpp')

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 1d3c5d4..b65a1f6 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -6429,6 +6429,7 @@ BOOL LLAgent::isWearingItem( const LLUUID& item_id )
 	return (getWearableFromWearableItem( item_id ) != NULL);
 }
 
+extern LLString gInitialOutfit;
 
 // static
 void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void** user_data )
@@ -6468,8 +6469,12 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
 			//avatar->createStandardWearables();
 
 			// no, deal with it by noting that we need to choose a
-			// gender.
-			gAgent.setGenderChosen(FALSE);
+			// 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;
 		}
 
-- 
cgit v1.1