2 files changed, 0 insertions, 44 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1f6d647..aa8b51a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2112,21 +2112,6 @@ namespace OpenSim.Region.Framework.Scenes
                 appearance = new AvatarAppearance();
             }
         
-            //try
-            //{
-            //    if (m_AvatarFactory != null)
-            //    {
-            //        if (m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
-            //            return;
-            //    }
-            //}
-            //catch (Exception e)
-            //{
-            //    m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}",
-            //        client.Name, e);
-            //}
-
-            //m_log.Warn("[APPEARANCE]: Appearance not found, returning default");
         }
 
         /// <summary>
@@ -2692,19 +2677,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        /// <summary>
-        /// Agent is crossing the border into a neighbouring region.  Tell the neighbour about it!
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="agentID"></param>
-        /// <param name="position"></param>
-        /// <param name="isFlying"></param>
-        /// <returns></returns>
-        public bool InformNeighbourOfCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
-        {
-            return m_sceneGridService.CrossToNeighbouringRegion(regionHandle, agentID, position, isFlying);
-        }
-
         public void CrossAgentToNewRegion(ScenePresence agent, bool isFlying)
         {
             m_sceneGridService.CrossAgentToNewRegion(this, agent, isFlying);
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 8271829..9a6bd87 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -99,7 +99,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_regionInfo = regionInfos;
             m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName;
-            m_commsProvider.InterRegion.rdebugRegionName = regionInfos.RegionName;            
             regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo);
 
             if (regionCommsHost != null)
@@ -1017,16 +1016,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             return previousNeighbours.FindAll(delegate(ulong handle) { return !currentNeighbours.Contains(handle); });
         }
-        /// <summary>
-        /// Inform a neighbouring region that an avatar is about to cross into it.
-        /// </summary>
-        /// <param name="regionhandle"></param>
-        /// <param name="agentID"></param>
-        /// <param name="position"></param>
-        public bool CrossToNeighbouringRegion(ulong regionhandle, UUID agentID, Vector3 position, bool isFlying)
-        {
-            return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
-        }
 
         public void CrossAgentToNewRegion(Scene scene, ScenePresence agent, bool isFlying)
         {
@@ -1205,11 +1194,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
 
-        public bool PrimCrossToNeighboringRegion(ulong regionhandle, UUID primID, string objData, int XMLMethod)
-        {
-            return m_commsProvider.InterRegion.InformRegionOfPrimCrossing(regionhandle, primID, objData, XMLMethod);
-        }
-
         public Dictionary<string, string> GetGridSettings()
         {
             return m_commsProvider.GridService.GetGridSettings();