diff options
author | Adam Frisby | 2007-07-19 00:52:10 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-19 00:52:10 +0000 |
commit | 36fc7390f2aabb745455f23f276725f102cacbf6 (patch) | |
tree | e5bd15a711b84c48705153e36aee0174d6cbb8be /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | * Nearly back down to zero compiler warnings again... (diff) | |
download | opensim-SC-36fc7390f2aabb745455f23f276725f102cacbf6.zip opensim-SC-36fc7390f2aabb745455f23f276725f102cacbf6.tar.gz opensim-SC-36fc7390f2aabb745455f23f276725f102cacbf6.tar.bz2 opensim-SC-36fc7390f2aabb745455f23f276725f102cacbf6.tar.xz |
* Moved EventManager to SceneBase (from Scene)
* Added OnShutdown event to EventManager (to be used to perform cleanups, etc)
* Fixed another compiler warning.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 3abd96d..7ed4c96 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -64,10 +64,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
64 | private int landPrimCheckCount; | 64 | private int landPrimCheckCount; |
65 | private Mutex updateLock; | 65 | private Mutex updateLock; |
66 | 66 | ||
67 | protected StorageManager storageManager; | ||
67 | protected AgentCircuitManager authenticateHandler; | 68 | protected AgentCircuitManager authenticateHandler; |
68 | protected RegionCommsListener regionCommsHost; | 69 | protected RegionCommsListener regionCommsHost; |
69 | protected CommunicationsManager commsManager; | 70 | protected CommunicationsManager commsManager; |
70 | protected StorageManager storageManager; | ||
71 | 71 | ||
72 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); | 72 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); |
73 | protected BaseHttpServer httpListener; | 73 | protected BaseHttpServer httpListener; |
@@ -97,13 +97,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
97 | get { return m_estateManager; } | 97 | get { return m_estateManager; } |
98 | } | 98 | } |
99 | 99 | ||
100 | private EventManager m_eventManager; | ||
101 | |||
102 | public EventManager EventManager | ||
103 | { | ||
104 | get { return m_eventManager; } | ||
105 | } | ||
106 | |||
107 | private ScriptManager m_scriptManager; | 100 | private ScriptManager m_scriptManager; |
108 | 101 | ||
109 | public ScriptManager ScriptManager | 102 | public ScriptManager ScriptManager |