aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorlbsa712007-07-16 23:25:35 +0000
committerlbsa712007-07-16 23:25:35 +0000
commit497ab5d7abec3c644a6340c1c64a2557dbade0ef (patch)
tree6ff6d849c724db80116205c3bbad6b704c73126d /OpenSim/Region/Environment
parent* Trimmed a few hundred warnings off SimpleApp. (diff)
downloadopensim-SC-497ab5d7abec3c644a6340c1c64a2557dbade0ef.zip
opensim-SC-497ab5d7abec3c644a6340c1c64a2557dbade0ef.tar.gz
opensim-SC-497ab5d7abec3c644a6340c1c64a2557dbade0ef.tar.bz2
opensim-SC-497ab5d7abec3c644a6340c1c64a2557dbade0ef.tar.xz
* RegionApplicationBase restructuring now complete
* Still has some weird bug in SimpleApp though.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/RegionManager.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
index f951701..e75ee60 100644
--- a/OpenSim/Region/Environment/RegionManager.cs
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -10,7 +10,7 @@ namespace OpenSim.Region.Environment
10{ 10{
11 public class RegionManager 11 public class RegionManager
12 { 12 {
13 protected AuthenticateSessionsBase authenticateHandler; 13 protected AgentCircuitManager authenticateHandler;
14 protected RegionCommsListener regionCommsHost; 14 protected RegionCommsListener regionCommsHost;
15 protected CommunicationsManager commsManager; 15 protected CommunicationsManager commsManager;
16 protected List<Caps> capsHandlers = new List<Caps>(); 16 protected List<Caps> capsHandlers = new List<Caps>();
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d2bb030..671b222 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Environment.Scenes
66 private int landPrimCheckCount; 66 private int landPrimCheckCount;
67 private Mutex updateLock; 67 private Mutex updateLock;
68 68
69 protected AuthenticateSessionsBase authenticateHandler; 69 protected AgentCircuitManager authenticateHandler;
70 protected RegionCommsListener regionCommsHost; 70 protected RegionCommsListener regionCommsHost;
71 protected CommunicationsManager commsManager; 71 protected CommunicationsManager commsManager;
72 protected StorageManager storageManager; 72 protected StorageManager storageManager;
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment.Scenes
128 /// <param name="clientThreads">Dictionary to contain client threads</param> 128 /// <param name="clientThreads">Dictionary to contain client threads</param>
129 /// <param name="regionHandle">Region Handle for this region</param> 129 /// <param name="regionHandle">Region Handle for this region</param>
130 /// <param name="regionName">Region Name for this region</param> 130 /// <param name="regionName">Region Name for this region</param>
131 public Scene(RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer) 131 public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer)
132 { 132 {
133 updateLock = new Mutex(false); 133 updateLock = new Mutex(false);
134 this.authenticateHandler = authen; 134 this.authenticateHandler = authen;