More cleaning up when deleting regions from a instance. NOTE: IGridServices.DeregisterRegion() method needs implementing for grid mode.

3 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 98057f9..01a55fb 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -36,6 +36,10 @@ using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules
 {
+    //this is first attempt to start breaking the mess thats called the assetcache up.
+    // basically this should be the texture sending (to clients) code moved out of assetcache 
+    //and some small clean up
+    // but on first tests it didn't seem to work very well so is currently not in use.
     public class TextureDownloadModule : IRegionModule
     {
         private Scene m_scene;
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 9bd55e1..4d4f78f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Scenes
             regionCommsHost.OnExpectUser -= NewUserConnection;
             regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
             regionCommsHost.OnCloseAgentConnection -= CloseConnection;
-            //regionCommsHost.RemoveRegion(m_regionInfo); //TODO add to method to commsManager
+            m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
             regionCommsHost = null;
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index caef883..87fa5cf 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -674,6 +674,7 @@ namespace OpenSim.Region.Environment.Scenes
             SendAnimPack(Animations.AnimsLLUUID["SIT"], 1);
             SendFullUpdateToAllClients();
         }
+
         public void HandleSetAlwaysRun(IClientAPI remoteClient, bool SetAlwaysRun)
         {
             m_setAlwaysRun = SetAlwaysRun;
@@ -683,6 +684,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
         }
+
         protected void UpdateMovementAnimations(bool update_movementflag)
         {
             if (update_movementflag)