aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
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;
36 36
37namespace OpenSim.Region.Environment.Modules 37namespace OpenSim.Region.Environment.Modules
38{ 38{
39 //this is first attempt to start breaking the mess thats called the assetcache up.
40 // basically this should be the texture sending (to clients) code moved out of assetcache
41 //and some small clean up
42 // but on first tests it didn't seem to work very well so is currently not in use.
39 public class TextureDownloadModule : IRegionModule 43 public class TextureDownloadModule : IRegionModule
40 { 44 {
41 private Scene m_scene; 45 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
43 regionCommsHost.OnExpectUser -= NewUserConnection; 43 regionCommsHost.OnExpectUser -= NewUserConnection;
44 regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing; 44 regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
45 regionCommsHost.OnCloseAgentConnection -= CloseConnection; 45 regionCommsHost.OnCloseAgentConnection -= CloseConnection;
46 //regionCommsHost.RemoveRegion(m_regionInfo); //TODO add to method to commsManager 46 m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
47 regionCommsHost = null; 47 regionCommsHost = null;
48 } 48 }
49 49
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
674 SendAnimPack(Animations.AnimsLLUUID["SIT"], 1); 674 SendAnimPack(Animations.AnimsLLUUID["SIT"], 1);
675 SendFullUpdateToAllClients(); 675 SendFullUpdateToAllClients();
676 } 676 }
677
677 public void HandleSetAlwaysRun(IClientAPI remoteClient, bool SetAlwaysRun) 678 public void HandleSetAlwaysRun(IClientAPI remoteClient, bool SetAlwaysRun)
678 { 679 {
679 m_setAlwaysRun = SetAlwaysRun; 680 m_setAlwaysRun = SetAlwaysRun;
@@ -683,6 +684,7 @@ namespace OpenSim.Region.Environment.Scenes
683 } 684 }
684 685
685 } 686 }
687
686 protected void UpdateMovementAnimations(bool update_movementflag) 688 protected void UpdateMovementAnimations(bool update_movementflag)
687 { 689 {
688 if (update_movementflag) 690 if (update_movementflag)