* Removed the unused GridRegion.getInternalEndPointPort() (just use InternalEndPoint.Port). This class is complex enough as it is
* Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space * Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happeningslimupdates
parent
3437605da6
commit
d506449f67
|
@ -1120,10 +1120,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbor region {2} @ {3} " +
|
||||||
|
"and EstablishAgentCommunication with seed cap {4}",
|
||||||
|
m_scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath);
|
||||||
|
|
||||||
eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID);
|
eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID);
|
||||||
eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
|
eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
|
||||||
m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1} in region {2}",
|
|
||||||
capsPath, sp.UUID, sp.Scene.RegionInfo.RegionName);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -173,7 +173,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.WarnFormat("[INTERGRID]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize);
|
m_log.InfoFormat("[INTERGRID]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -285,11 +285,6 @@ namespace OpenSim.Services.Interfaces
|
||||||
get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
|
get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getInternalEndPointPort()
|
|
||||||
{
|
|
||||||
return m_internalEndPoint.Port;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Dictionary<string, object> ToKeyValuePairs()
|
public Dictionary<string, object> ToKeyValuePairs()
|
||||||
{
|
{
|
||||||
Dictionary<string, object> kvp = new Dictionary<string, object>();
|
Dictionary<string, object> kvp = new Dictionary<string, object>();
|
||||||
|
|
Loading…
Reference in New Issue