Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
parent
9069114d0f
commit
19558f380a
|
@ -352,7 +352,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
|
||||||
// Save avatar attachment information
|
// Save avatar attachment information
|
||||||
if (m_scene.AvatarFactory != null)
|
if (m_scene.AvatarFactory != null)
|
||||||
{
|
{
|
||||||
m_log.Debug("[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", ItemID: " + itemID);
|
m_log.Debug("[ATTACHMENTS MODULE]: Dettaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
|
||||||
m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
|
m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -198,7 +198,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
|
||||||
|
|
||||||
public void UpdateDatabase(UUID user, AvatarAppearance appearance)
|
public void UpdateDatabase(UUID user, AvatarAppearance appearance)
|
||||||
{
|
{
|
||||||
//m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
|
m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
|
||||||
AvatarData adata = new AvatarData(appearance);
|
AvatarData adata = new AvatarData(appearance);
|
||||||
m_scene.AvatarService.SetAvatar(user, adata);
|
m_scene.AvatarService.SetAvatar(user, adata);
|
||||||
}
|
}
|
||||||
|
|
|
@ -922,12 +922,40 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void EnableChildAgent(ScenePresence sp, GridRegion region)
|
public void EnableChildAgent(ScenePresence sp, GridRegion region)
|
||||||
{
|
{
|
||||||
|
m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName);
|
||||||
|
|
||||||
|
AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
|
||||||
AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
|
AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
|
||||||
agent.BaseFolder = UUID.Zero;
|
agent.BaseFolder = UUID.Zero;
|
||||||
agent.InventoryFolder = UUID.Zero;
|
agent.InventoryFolder = UUID.Zero;
|
||||||
agent.startpos = new Vector3(128, 128, 70);
|
agent.startpos = new Vector3(128, 128, 70);
|
||||||
agent.child = true;
|
agent.child = true;
|
||||||
agent.Appearance = sp.Appearance;
|
agent.Appearance = sp.Appearance;
|
||||||
|
agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
|
||||||
|
|
||||||
|
agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
|
||||||
|
m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
|
||||||
|
|
||||||
|
if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
|
||||||
|
agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
|
||||||
|
m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
|
||||||
|
|
||||||
|
sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
|
||||||
|
foreach (ulong h in agent.ChildrenCapSeeds.Keys)
|
||||||
|
m_log.DebugFormat("[XXX] --> {0}", h);
|
||||||
|
m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
|
||||||
|
agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath);
|
||||||
|
|
||||||
|
if (sp.Scene.CapsModule != null)
|
||||||
|
{
|
||||||
|
sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, agent.ChildrenCapSeeds);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentAgentCircuit != null)
|
||||||
|
{
|
||||||
|
agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
|
||||||
|
agent.Viewer = currentAgentCircuit.Viewer;
|
||||||
|
}
|
||||||
|
|
||||||
InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
|
InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
|
||||||
d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
|
d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
|
||||||
|
|
|
@ -123,17 +123,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
|
||||||
|
|
||||||
public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
|
public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
|
|
||||||
thisRegion.RegionName, regionHandle, m_Scenes.Count);
|
|
||||||
foreach (Scene s in m_Scenes)
|
foreach (Scene s in m_Scenes)
|
||||||
{
|
{
|
||||||
if (s.RegionInfo.RegionHandle == regionHandle)
|
if (s.RegionInfo.RegionHandle == regionHandle)
|
||||||
{
|
{
|
||||||
m_log.Debug("[NEIGHBOUR IN CONNECTOR]: Found region to SendHelloNeighbour");
|
//m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0} to {1}", thisRegion.RegionName, s.RegionInfo.RegionName);
|
||||||
return s.IncomingHelloNeighbour(thisRegion);
|
return s.IncomingHelloNeighbour(thisRegion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -181,22 +181,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
|
||||||
|
|
||||||
public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
|
public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
|
||||||
{
|
{
|
||||||
if (m_LocalCache.ContainsKey(regionID))
|
return m_GridService.GetNeighbours(scopeID, regionID);
|
||||||
{
|
|
||||||
List<GridRegion> neighbours = m_LocalCache[regionID].GetNeighbours();
|
|
||||||
if (neighbours.Count == 0)
|
|
||||||
// try the DB
|
|
||||||
neighbours = m_GridService.GetNeighbours(scopeID, regionID);
|
|
||||||
return neighbours;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.WarnFormat("[LOCAL GRID CONNECTOR]: GetNeighbours: Requested region {0} is not on this sim", regionID);
|
|
||||||
return new List<GridRegion>();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Don't go to the DB
|
|
||||||
//return m_GridService.GetNeighbours(scopeID, regionID);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
|
public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
|
||||||
|
|
|
@ -153,12 +153,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Let's override GetNeighbours completely -- never go to the grid server
|
|
||||||
// Neighbours are/should be cached locally
|
|
||||||
// For retrieval from the DB, caller should call GetRegionByPosition
|
|
||||||
public override List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
|
public override List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
|
||||||
{
|
{
|
||||||
return m_LocalGridService.GetNeighbours(scopeID, regionID);
|
return base.GetNeighbours(scopeID, regionID);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
|
public override GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
|
||||||
|
|
|
@ -121,17 +121,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
|
||||||
|
|
||||||
public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
|
public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}",
|
m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}.",
|
||||||
thisRegion.RegionName, regionHandle, m_Scenes.Count);
|
thisRegion.RegionName, regionHandle);
|
||||||
foreach (Scene s in m_Scenes)
|
foreach (Scene s in m_Scenes)
|
||||||
{
|
{
|
||||||
if (s.RegionInfo.RegionHandle == regionHandle)
|
if (s.RegionInfo.RegionHandle == regionHandle)
|
||||||
{
|
{
|
||||||
m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
|
//m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
|
||||||
return s.IncomingHelloNeighbour(thisRegion);
|
return s.IncomingHelloNeighbour(thisRegion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
|
//m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -181,7 +181,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
|
||||||
// else do the remote thing
|
// else do the remote thing
|
||||||
if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
|
if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
|
||||||
{
|
{
|
||||||
//m_regionClient.SendUserInformation(regInfo, aCircuit);
|
|
||||||
return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
|
return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -948,12 +948,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// Let the grid service module know, so this can be cached
|
// Let the grid service module know, so this can be cached
|
||||||
m_eventManager.TriggerOnRegionUp(otherRegion);
|
m_eventManager.TriggerOnRegionUp(otherRegion);
|
||||||
|
|
||||||
RegionInfo regInfo = new RegionInfo(xcell, ycell, otherRegion.InternalEndPoint, otherRegion.ExternalHostName);
|
|
||||||
regInfo.RegionID = otherRegion.RegionID;
|
|
||||||
regInfo.RegionName = otherRegion.RegionName;
|
|
||||||
regInfo.ScopeID = otherRegion.ScopeID;
|
|
||||||
regInfo.ExternalHostName = otherRegion.ExternalHostName;
|
|
||||||
GridRegion r = new GridRegion(regInfo);
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ForEachScenePresence(delegate(ScenePresence agent)
|
ForEachScenePresence(delegate(ScenePresence agent)
|
||||||
|
@ -968,7 +962,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
old.Add(otherRegion.RegionHandle);
|
old.Add(otherRegion.RegionHandle);
|
||||||
agent.DropOldNeighbours(old);
|
agent.DropOldNeighbours(old);
|
||||||
if (m_teleportModule != null)
|
if (m_teleportModule != null)
|
||||||
m_teleportModule.EnableChildAgent(agent, r);
|
m_teleportModule.EnableChildAgent(agent, otherRegion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -1518,6 +1512,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
|
m_log.DebugFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
|
||||||
LoginsDisabled = false;
|
LoginsDisabled = false;
|
||||||
|
m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1802,6 +1797,8 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
RegisterCommsEvents();
|
RegisterCommsEvents();
|
||||||
|
|
||||||
|
m_sceneGridService.SetScene(this);
|
||||||
|
|
||||||
// These two 'commands' *must be* next to each other or sim rebooting fails.
|
// These two 'commands' *must be* next to each other or sim rebooting fails.
|
||||||
//m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
|
//m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
|
||||||
|
|
||||||
|
@ -1812,24 +1809,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
throw new Exception(error);
|
throw new Exception(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_sceneGridService.SetScene(this);
|
|
||||||
m_sceneGridService.InformNeighborsThatRegionisUp(RequestModuleInterface<INeighbourService>(), RegionInfo);
|
|
||||||
|
|
||||||
//Dictionary<string, string> dGridSettings = m_sceneGridService.GetGridSettings();
|
|
||||||
|
|
||||||
//if (dGridSettings.ContainsKey("allow_forceful_banlines"))
|
|
||||||
//{
|
|
||||||
// if (dGridSettings["allow_forceful_banlines"] != "TRUE")
|
|
||||||
// {
|
|
||||||
// m_log.Info("[GRID]: Grid is disabling forceful parcel banlists");
|
|
||||||
// EventManager.TriggerSetAllowForcefulBan(false);
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// m_log.Info("[GRID]: Grid is allowing forceful parcel banlists");
|
|
||||||
// EventManager.TriggerSetAllowForcefulBan(true);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -182,24 +182,17 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
//m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
|
//m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
|
||||||
|
|
||||||
for (int x = (int)region.RegionLocX - 1; x <= region.RegionLocX + 1; x++)
|
List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
|
||||||
|
m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
|
||||||
|
foreach (GridRegion n in neighbours)
|
||||||
{
|
{
|
||||||
for (int y = (int)region.RegionLocY - 1; y <= region.RegionLocY + 1; y++)
|
InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
|
||||||
{
|
d.BeginInvoke(neighbourService, region, n.RegionHandle,
|
||||||
if (!((x == region.RegionLocX) && (y == region.RegionLocY))) // skip this region
|
InformNeighborsThatRegionisUpCompleted,
|
||||||
{
|
d);
|
||||||
ulong handle = Utils.UIntsToLong((uint)x * Constants.RegionSize, (uint)y * Constants.RegionSize);
|
|
||||||
InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
|
|
||||||
|
|
||||||
d.BeginInvoke(neighbourService, region, handle,
|
|
||||||
InformNeighborsThatRegionisUpCompleted,
|
|
||||||
d);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle);
|
public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -210,9 +210,6 @@ namespace OpenSim.Services.Connectors
|
||||||
GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);
|
GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);
|
||||||
rinfos.Add(rinfo);
|
rinfos.Add(rinfo);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response type {2}",
|
|
||||||
scopeID, regionID, r.GetType());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -299,9 +296,9 @@ namespace OpenSim.Services.Connectors
|
||||||
{
|
{
|
||||||
if (replyData["result"] is Dictionary<string, object>)
|
if (replyData["result"] is Dictionary<string, object>)
|
||||||
rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]);
|
rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]);
|
||||||
else
|
//else
|
||||||
m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received no region",
|
// m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received no region",
|
||||||
scopeID, x, y);
|
// scopeID, x, y);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received null response",
|
m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received null response",
|
||||||
|
|
|
@ -479,7 +479,7 @@ namespace OpenSim.Services.Connectors.Simulation
|
||||||
}
|
}
|
||||||
catch (WebException ex)
|
catch (WebException ex)
|
||||||
{
|
{
|
||||||
m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete {0}", ex.Message);
|
m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
|
|
@ -273,14 +273,15 @@ namespace OpenSim.Services.GridService
|
||||||
if (region != null)
|
if (region != null)
|
||||||
{
|
{
|
||||||
// Not really? Maybe?
|
// Not really? Maybe?
|
||||||
List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize, region.posY - (int)Constants.RegionSize,
|
List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize - 1, region.posY - (int)Constants.RegionSize - 1,
|
||||||
region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID);
|
region.posX + (int)Constants.RegionSize + 1, region.posY + (int)Constants.RegionSize + 1, scopeID);
|
||||||
|
|
||||||
foreach (RegionData rdata in rdatas)
|
foreach (RegionData rdata in rdatas)
|
||||||
if (rdata.RegionID != regionID)
|
if (rdata.RegionID != regionID)
|
||||||
rinfos.Add(RegionData2RegionInfo(rdata));
|
rinfos.Add(RegionData2RegionInfo(rdata));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count);
|
||||||
return rinfos;
|
return rinfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue