aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/ClientManager.cs8
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs8
-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
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
8 files changed, 21 insertions, 17 deletions
diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/General/ClientManager.cs
index 5b6e7b3..03ad226 100644
--- a/OpenSim/Framework/General/ClientManager.cs
+++ b/OpenSim/Framework/General/ClientManager.cs
@@ -8,11 +8,11 @@ namespace OpenSim.Framework
8 public delegate void ForEachClientDelegate( IClientAPI client ); 8 public delegate void ForEachClientDelegate( IClientAPI client );
9 public class ClientManager 9 public class ClientManager
10 { 10 {
11 private Dictionary<uint, IClientAPI> m_clientThreads; 11 private Dictionary<uint, IClientAPI> m_clients;
12 12
13 public void ForEachClient(ForEachClientDelegate whatToDo) 13 public void ForEachClient(ForEachClientDelegate whatToDo)
14 { 14 {
15 foreach (IClientAPI client in m_clientThreads.Values) 15 foreach (IClientAPI client in m_clients.Values)
16 { 16 {
17 whatToDo(client); 17 whatToDo(client);
18 } 18 }
@@ -20,12 +20,12 @@ namespace OpenSim.Framework
20 20
21 public ClientManager() 21 public ClientManager()
22 { 22 {
23 m_clientThreads = new Dictionary<uint, IClientAPI>(); 23 m_clients = new Dictionary<uint, IClientAPI>();
24 } 24 }
25 25
26 public void Add(uint id, IClientAPI client ) 26 public void Add(uint id, IClientAPI client )
27 { 27 {
28 m_clientThreads.Add( id, client ); 28 m_clients.Add( id, client );
29 } 29 }
30 } 30 }
31} 31}
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index c5c9efc..949c369 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -217,7 +217,7 @@ namespace OpenSim
217 m_udpServer.Add(udpServer); 217 m_udpServer.Add(udpServer);
218 this.regionData.Add(regionDat); 218 this.regionData.Add(regionDat);
219 219
220 LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache, httpServer); 220 LocalWorld = new Scene(udpServer.PacketServer.ClientManager, regionDat, authenBase, commsManager, this.AssetCache, httpServer);
221 this.m_localWorld.Add(LocalWorld); 221 this.m_localWorld.Add(LocalWorld);
222 //LocalWorld.InventoryCache = InventoryCache; 222 //LocalWorld.InventoryCache = InventoryCache;
223 //LocalWorld.AssetCache = AssetCache; 223 //LocalWorld.AssetCache = AssetCache;
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 5e62450..c7ca315 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -41,7 +41,11 @@ namespace OpenSim.Region.ClientStack
41 private ClientStackNetworkHandler _networkHandler; 41 private ClientStackNetworkHandler _networkHandler;
42 private IWorld _localWorld; 42 private IWorld _localWorld;
43 public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>(); 43 public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
44 public ClientManager ClientAPIs = new ClientManager(); 44 private ClientManager m_clientManager = new ClientManager();
45 public ClientManager ClientManager
46 {
47 get { return m_clientManager; }
48 }
45 49
46 public PacketServer(ClientStackNetworkHandler networkHandler) 50 public PacketServer(ClientStackNetworkHandler networkHandler)
47 { 51 {
@@ -150,7 +154,7 @@ namespace OpenSim.Region.ClientStack
150 authenticateSessionsClass); 154 authenticateSessionsClass);
151 155
152 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); 156 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
153 this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); 157 this.m_clientManager.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
154 158
155 return true; 159 return true;
156 } 160 }
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;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index b82529a..3c69420 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -15,8 +15,8 @@ namespace SimpleApp
15 { 15 {
16 private List<ScenePresence> m_avatars; 16 private List<ScenePresence> m_avatars;
17 17
18 public MyWorld(ClientManager clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 18 public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
19 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer) 19 : base(clientManager, regionInfo, authen, commsMan, assetCach, httpServer)
20 { 20 {
21 m_avatars = new List<Avatar>(); 21 m_avatars = new List<Avatar>();
22 } 22 }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 4567d7e..5cfc769 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -54,7 +54,7 @@ namespace SimpleApp
54 RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" ); 54 RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" );
55 55
56 BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port ); 56 BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port );
57 MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); 57 MyWorld world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
58 world.PhysScene = PhysicsScene.Null; 58 world.PhysScene = PhysicsScene.Null;
59 udpServer.LocalWorld = world; 59 udpServer.LocalWorld = world;
60 60