diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 678f3dc3a5..4dcb99f0ac 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
#endregion
- #region ISimulation
+ #region ISimulationService
public IScene GetScene(UUID regionId)
{
@@ -353,7 +353,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return false;
}
- #endregion /* IInterregionComms */
+ #endregion
#region Misc
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index f45f560a96..cc014307af 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
#endregion
- #region IInterregionComms
+ #region ISimulationService
public IScene GetScene(UUID regionId)
{
@@ -279,6 +279,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
return false;
}
- #endregion /* IInterregionComms */
+ #endregion
}
}
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
deleted file mode 100644
index 2d6287f87d..0000000000
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework.Interfaces
-{
- public delegate bool ChildAgentUpdateReceived(AgentData data);
-
- public interface IInterregionCommsOut
- {
- #region Agents
-
- bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, uint teleportFlags, out string reason);
-
- ///
- /// Full child agent update.
- ///
- ///
- ///
- ///
- bool SendChildAgentUpdate(ulong regionHandle, AgentData data);
-
- ///
- /// Short child agent update, mostly for position.
- ///
- ///
- ///
- ///
- bool SendChildAgentUpdate(ulong regionHandle, AgentPosition data);
-
- bool SendRetrieveRootAgent(ulong regionHandle, UUID id, out IAgentData agent);
-
- ///
- /// Message from receiving region to departing region, telling it got contacted by the client.
- /// When sent over REST, it invokes the opaque uri.
- ///
- ///
- ///
- ///
- ///
- bool SendReleaseAgent(ulong regionHandle, UUID id, string uri);
-
- ///
- /// Close agent.
- ///
- ///
- ///
- ///
- bool SendCloseAgent(ulong regionHandle, UUID id);
-
- #endregion Agents
-
- #region Objects
-
- ///
- /// Create an object in the destination region. This message is used primarily for prim crossing.
- ///
- ///
- ///
- ///
- ///
- bool SendCreateObject(ulong regionHandle, SceneObjectGroup sog, bool isLocalCall);
-
- ///
- /// Create an object from the user's inventory in the destination region.
- /// This message is used primarily by clients.
- ///
- ///
- ///
- ///
- ///
- bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID);
-
- #endregion Objects
-
- }
-
- // This may not be needed, but having it here for now.
- public interface IInterregionCommsIn
- {
- event ChildAgentUpdateReceived OnChildAgentUpdate;
- }
-
-}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7772f9476b..567ce2ad03 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4405,18 +4405,6 @@ namespace OpenSim.Region.Framework.Scenes
return sp;
}
- public virtual bool IncomingRetrieveRootAgent(UUID id, out IAgentData agent)
- {
- agent = null;
- ScenePresence sp = GetScenePresence(id);
- if ((sp != null) && (!sp.IsChildAgent))
- {
- sp.IsChildAgent = true;
- return sp.CopyAgent(out agent);
- }
-
- return false;
- }
///
/// Authenticated close (via network)
///