Reposition 'user profile not found' messages to stop spurious messages caused by other usermanager usage
This should stop the regular spurious messages in the grid user consoleafrisby
parent
e4276f566d
commit
2061f55007
|
@ -80,7 +80,13 @@ namespace OpenSim.Framework.UserManagement
|
||||||
|
|
||||||
userProfile = GetTheUser(firstname, lastname);
|
userProfile = GetTheUser(firstname, lastname);
|
||||||
if (userProfile == null)
|
if (userProfile == null)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Verbose(
|
||||||
|
"LOGIN",
|
||||||
|
"Could not find a profile for " + firstname + " " + lastname);
|
||||||
|
|
||||||
return logResponse.CreateLoginFailedResponse();
|
return logResponse.CreateLoginFailedResponse();
|
||||||
|
}
|
||||||
|
|
||||||
GoodLogin = AuthenticateUser(userProfile, passwd);
|
GoodLogin = AuthenticateUser(userProfile, passwd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,10 +101,6 @@ namespace OpenSim.Framework.UserManagement
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MainLog.Instance.Notice(
|
|
||||||
"USERSTORAGE",
|
|
||||||
"Could not find user " + uuid.ToStringHyphenated() + " in persistent storage.");
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,9 +142,6 @@ namespace OpenSim.Framework.UserManagement
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MainLog.Instance.Notice(
|
|
||||||
"USERSTORAGE", "Could not find user " + fname + " " + lname + " in persistent storage.");
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -292,26 +285,26 @@ namespace OpenSim.Framework.UserManagement
|
||||||
agent.currentPos = profile.homeLocation;
|
agent.currentPos = profile.homeLocation;
|
||||||
|
|
||||||
// If user specified additional start, use that
|
// If user specified additional start, use that
|
||||||
if (requestData.ContainsKey("start"))
|
// if (requestData.ContainsKey("start"))
|
||||||
{
|
// {
|
||||||
string startLoc = ((string) requestData["start"]).Trim();
|
// string startLoc = ((string) requestData["start"]).Trim();
|
||||||
if (!(startLoc == "last" || startLoc == "home"))
|
// if (!(startLoc == "last" || startLoc == "home"))
|
||||||
{
|
// {
|
||||||
// Format: uri:Ahern&162&213&34
|
// // Format: uri:Ahern&162&213&34
|
||||||
try
|
// try
|
||||||
{
|
// {
|
||||||
string[] parts = startLoc.Remove(0, 4).Split('&');
|
// string[] parts = startLoc.Remove(0, 4).Split('&');
|
||||||
//string region = parts[0];
|
// //string region = parts[0];
|
||||||
|
//
|
||||||
////////////////////////////////////////////////////
|
// ////////////////////////////////////////////////////
|
||||||
//SimProfile SimInfo = new SimProfile();
|
// //SimProfile SimInfo = new SimProfile();
|
||||||
//SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
|
// //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
|
||||||
}
|
// }
|
||||||
catch (Exception)
|
// catch (Exception)
|
||||||
{
|
// {
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
// What time did the user login?
|
// What time did the user login?
|
||||||
agent.loginTime = Util.UnixTimeSinceEpoch();
|
agent.loginTime = Util.UnixTimeSinceEpoch();
|
||||||
|
|
Loading…
Reference in New Issue