FIRE-15116: Usernames with underscores don't work on OpenSim

Mon, 15 Dec 2014 09:21:19 +0100

author
Ansariel
date
Mon, 15 Dec 2014 09:21:19 +0100
changeset 43074
6133b9abaeec
parent 43073
e898f9b74a41
child 43075
748d75af17b6

FIRE-15116: Usernames with underscores don't work on OpenSim

indra/newview/llpanellogin.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpanellogin.cpp	Mon Dec 15 03:37:45 2014 +0100
     1.2 +++ b/indra/newview/llpanellogin.cpp	Mon Dec 15 09:21:19 2014 +0100
     1.3 @@ -663,7 +663,21 @@
     1.4  	{
     1.5  		// Be lenient in terms of what separators we allow for two-word names
     1.6  		// and allow legacy users to login with firstname.lastname
     1.7 +		// <FS:Ansariel> FIRE-15116: Usernames with underscores don't work on OpenSim
     1.8 +		//separator_index = username.find_first_of(" ._");
     1.9 +#ifdef OPENSIM
    1.10 +		if (LLGridManager::getInstance()->isInSecondLife())
    1.11 +		{
    1.12 +			separator_index = username.find_first_of(" ._");
    1.13 +		}
    1.14 +		else
    1.15 +		{
    1.16 +			separator_index = username.find_first_of(" .");
    1.17 +		}
    1.18 +#else
    1.19  		separator_index = username.find_first_of(" ._");
    1.20 +#endif
    1.21 +		// </FS:Ansariel>
    1.22  		std::string first = username.substr(0, separator_index);
    1.23  		std::string last;
    1.24  		if (separator_index != username.npos)

mercurial