diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 17:10:45 -0700 | 
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 17:10:45 -0700 | 
| commit | 5dc6043ae8e3e6b8ced0d6d92a6ab09620d3772e (patch) | |
| tree | d7079377254231b8c88b7055a4cd2628e4cf4e16 | |
| parent | b9096fc954d615a9eff44c3e9bfe1c7d9cadd87a (diff) | |
| parent | 1f02c1dd32cb5ebb2eb6e9186d1f62710ceb09cf (diff) | |
automated merge
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index a84bb98a90..0a464b3b6c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3041,7 +3041,7 @@ bool process_login_success_response()  	// Default male and female avatars allowing the user to choose their avatar on first login.  	// These may be passed up by SLE to allow choice of enterprise avatars instead of the standard  	// "new ruth."  Not to be confused with 'initial-outfit' below  -	LLSD newuser_config = response["newuser-config"]; +	LLSD newuser_config = response["newuser-config"][0];  	if(newuser_config.has("DefaultFemaleAvatar"))  	{  		gSavedSettings.setString("DefaultFemaleAvatar", newuser_config["DefaultFemaleAvatar"].asString()); 		  | 
