aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs2
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index bb19996..e64e147 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes
140 // Console.WriteLine("Chat message"); 140 // Console.WriteLine("Chat message");
141 ScenePresence avatar = null; 141 ScenePresence avatar = null;
142 142
143 m_clientThreads.ForEachClient(delegate(IClientAPI client) 143 m_clientManager.ForEachClient(delegate(IClientAPI client)
144 { 144 {
145 int dis = -1000; 145 int dis = -1000;
146 if (this.Avatars.ContainsKey(client.AgentId)) 146 if (this.Avatars.ContainsKey(client.AgentId))
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 043dcd7..81c56c4 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -98,13 +98,13 @@ namespace OpenSim.Region.Environment.Scenes
98 /// <param name="clientThreads">Dictionary to contain client threads</param> 98 /// <param name="clientThreads">Dictionary to contain client threads</param>
99 /// <param name="regionHandle">Region Handle for this region</param> 99 /// <param name="regionHandle">Region Handle for this region</param>
100 /// <param name="regionName">Region Name for this region</param> 100 /// <param name="regionName">Region Name for this region</param>
101 public Scene(ClientManager clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 101 public Scene(ClientManager clientManager, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
102 { 102 {
103 updateLock = new Mutex(false); 103 updateLock = new Mutex(false);
104 this.authenticateHandler = authen; 104 this.authenticateHandler = authen;
105 this.commsManager = commsMan; 105 this.commsManager = commsMan;
106 this.assetCache = assetCach; 106 this.assetCache = assetCach;
107 m_clientThreads = clientThreads; 107 m_clientManager = clientManager;
108 m_regInfo = regInfo; 108 m_regInfo = regInfo;
109 m_regionHandle = m_regInfo.RegionHandle; 109 m_regionHandle = m_regInfo.RegionHandle;
110 m_regionName = m_regInfo.RegionName; 110 m_regionName = m_regInfo.RegionName;
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
229 } 229 }
230 this.localStorage.SaveMap(this.Terrain.getHeights1D()); 230 this.localStorage.SaveMap(this.Terrain.getHeights1D());
231 231
232 m_clientThreads.ForEachClient(delegate(IClientAPI client) 232 m_clientManager.ForEachClient(delegate(IClientAPI client)
233 { 233 {
234 this.SendLayerData(client); 234 this.SendLayerData(client);
235 }); 235 });
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Scenes
260 } 260 }
261 this.localStorage.SaveMap(this.Terrain.getHeights1D()); 261 this.localStorage.SaveMap(this.Terrain.getHeights1D());
262 262
263 m_clientThreads.ForEachClient(delegate(IClientAPI client) 263 m_clientManager.ForEachClient(delegate(IClientAPI client)
264 { 264 {
265 this.SendLayerData(client); 265 this.SendLayerData(client);
266 }); 266 });
@@ -290,7 +290,7 @@ namespace OpenSim.Region.Environment.Scenes
290 { 290 {
291 /* Dont save here, rely on tainting system instead */ 291 /* Dont save here, rely on tainting system instead */
292 292
293 m_clientThreads.ForEachClient(delegate(IClientAPI client) 293 m_clientManager.ForEachClient(delegate(IClientAPI client)
294 { 294 {
295 this.SendLayerData(pointx, pointy, client); 295 this.SendLayerData(pointx, pointy, client);
296 }); 296 });
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 44121b4..811f54c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Scenes
41 public abstract class SceneBase : IWorld 41 public abstract class SceneBase : IWorld
42 { 42 {
43 public Dictionary<LLUUID, EntityBase> Entities; 43 public Dictionary<LLUUID, EntityBase> Entities;
44 protected ClientManager m_clientThreads; 44 protected ClientManager m_clientManager;
45 protected ulong m_regionHandle; 45 protected ulong m_regionHandle;
46 protected string m_regionName; 46 protected string m_regionName;
47 protected RegionInfo m_regInfo; 47 protected RegionInfo m_regInfo;