* Added and removed debug information relating to client connections
* Minor client fixes * Added the ability for a client to login without a UserProfile, allowing certain alternate clients to connect to the region.0.6.1-post-fixes
parent
6fd8960064
commit
434afaf717
|
@ -49,8 +49,7 @@ namespace OpenSim.Framework
|
|||
|
||||
public void ForEachClient(ForEachClientDelegate whatToDo)
|
||||
{
|
||||
// Wasteful, I know
|
||||
IClientAPI[] LocalClients = new IClientAPI[0];
|
||||
IClientAPI[] LocalClients;
|
||||
lock (m_clients)
|
||||
{
|
||||
LocalClients = new IClientAPI[m_clients.Count];
|
||||
|
|
|
@ -166,7 +166,7 @@ namespace OpenSim.Framework.Communications
|
|||
}
|
||||
else if (requestData.Contains("web_login_key"))
|
||||
{
|
||||
UUID webloginkey = UUID.Zero;
|
||||
UUID webloginkey;
|
||||
try
|
||||
{
|
||||
webloginkey = new UUID((string)requestData["web_login_key"]);
|
||||
|
|
|
@ -775,7 +775,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
|
||||
// Don't let a failure in an individual client thread crash the whole sim.
|
||||
m_log.ErrorFormat(
|
||||
"[CLIENT]: Client thread for {0} {1} crashed. Logging them out. Exception {2}", Name, AgentId, e);
|
||||
"[CLIENT]: Client thread for {0} {1} crashed. Logging them out.", Name, AgentId);
|
||||
m_log.Error(e.ToString());
|
||||
|
||||
try
|
||||
{
|
||||
|
|
|
@ -89,6 +89,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
{
|
||||
m_localScene = value;
|
||||
m_packetServer.LocalScene = m_localScene;
|
||||
|
||||
m_location = new Location(m_localScene.RegionInfo.RegionHandle);
|
||||
}
|
||||
}
|
||||
|
@ -404,6 +405,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
/// <param name="epProxy"></param>
|
||||
protected virtual void AddNewClient(UseCircuitCodePacket useCircuit, EndPoint epSender, EndPoint epProxy)
|
||||
{
|
||||
m_log.Debug("[CONNECTION DEBUGGING] AddNewClient Called");
|
||||
|
||||
//Slave regions don't accept new clients
|
||||
if (m_localScene.Region_Status != RegionStatus.SlaveScene)
|
||||
{
|
||||
|
|
|
@ -2746,6 +2746,9 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
/// <param name="agent"></param>
|
||||
public void NewUserConnection(AgentCircuitData agent)
|
||||
{
|
||||
m_log.DebugFormat("[CONNECTION DEBUGGING] Adding NewUserConnection for {0} with CC of {1}", agent.AgentID,
|
||||
agent.circuitcode);
|
||||
|
||||
if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
|
||||
{
|
||||
m_log.WarnFormat(
|
||||
|
|
|
@ -510,8 +510,9 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
RegisterToEvents();
|
||||
SetDirectionVectors();
|
||||
|
||||
CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid);
|
||||
userInfo.OnItemReceived += ItemReceived;
|
||||
CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid);
|
||||
if (userInfo != null)
|
||||
userInfo.OnItemReceived += ItemReceived;
|
||||
}
|
||||
|
||||
public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
|
||||
|
|
Loading…
Reference in New Issue