diff options
author | Justin Clarke Casey | 2008-12-12 18:48:29 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-12 18:48:29 +0000 |
commit | a7e145bdfdb994f4c171d32740790cffc3fc4ad3 (patch) | |
tree | 9eefc934ead5addb8feac898540f27a40995d288 /OpenSim/Region/Environment/Scenes | |
parent | * Deleted old EntiyList tests, added new EntityManager tests (diff) | |
download | opensim-SC-a7e145bdfdb994f4c171d32740790cffc3fc4ad3.zip opensim-SC-a7e145bdfdb994f4c171d32740790cffc3fc4ad3.tar.gz opensim-SC-a7e145bdfdb994f4c171d32740790cffc3fc4ad3.tar.bz2 opensim-SC-a7e145bdfdb994f4c171d32740790cffc3fc4ad3.tar.xz |
* refactor: pull out common user profile test code into utility functions
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index ad25670..b493f84 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -233,18 +233,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
233 | /// </summary> | 233 | /// </summary> |
234 | public delegate void RegisterCapsEvent(UUID agentID, Caps caps); | 234 | public delegate void RegisterCapsEvent(UUID agentID, Caps caps); |
235 | public event RegisterCapsEvent OnRegisterCaps; | 235 | public event RegisterCapsEvent OnRegisterCaps; |
236 | |||
236 | /// <summary> | 237 | /// <summary> |
237 | /// DeregisterCapsEvent is called by Scene when the caps | 238 | /// DeregisterCapsEvent is called by Scene when the caps |
238 | /// handler for an agent are removed. | 239 | /// handler for an agent are removed. |
239 | /// </summary> | 240 | /// </summary> |
240 | public delegate void DeregisterCapsEvent(UUID agentID, Caps caps); | 241 | public delegate void DeregisterCapsEvent(UUID agentID, Caps caps); |
241 | public event DeregisterCapsEvent OnDeregisterCaps; | 242 | public event DeregisterCapsEvent OnDeregisterCaps; |
243 | |||
242 | /// <summary> | 244 | /// <summary> |
243 | /// ChatFromWorldEvent is called via Scene when a chat message | 245 | /// ChatFromWorldEvent is called via Scene when a chat message |
244 | /// from world comes in. | 246 | /// from world comes in. |
245 | /// </summary> | 247 | /// </summary> |
246 | public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat); | 248 | public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat); |
247 | public event ChatFromWorldEvent OnChatFromWorld; | 249 | public event ChatFromWorldEvent OnChatFromWorld; |
250 | |||
248 | /// <summary> | 251 | /// <summary> |
249 | /// ChatFromClientEvent is triggered via ChatModule (or | 252 | /// ChatFromClientEvent is triggered via ChatModule (or |
250 | /// substitutes thereof) when a chat message | 253 | /// substitutes thereof) when a chat message |
@@ -252,6 +255,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
252 | /// </summary> | 255 | /// </summary> |
253 | public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat); | 256 | public delegate void ChatFromClientEvent(Object sender, OSChatMessage chat); |
254 | public event ChatFromClientEvent OnChatFromClient; | 257 | public event ChatFromClientEvent OnChatFromClient; |
258 | |||
255 | /// <summary> | 259 | /// <summary> |
256 | /// ChatBroadcastEvent is called via Scene when a broadcast chat message | 260 | /// ChatBroadcastEvent is called via Scene when a broadcast chat message |
257 | /// from world comes in | 261 | /// from world comes in |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 805ca5d..9528a0d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -76,13 +76,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
76 | /// </value> | 76 | /// </value> |
77 | public ILandChannel LandChannel; | 77 | public ILandChannel LandChannel; |
78 | 78 | ||
79 | protected EventManager m_eventManager; | 79 | /// <value> |
80 | 80 | /// Manage events that occur in this scene (avatar movement, script rez, etc.). Commonly used by region modules | |
81 | /// to subscribe to scene events. | ||
82 | /// </value> | ||
81 | public EventManager EventManager | 83 | public EventManager EventManager |
82 | { | 84 | { |
83 | get { return m_eventManager; } | 85 | get { return m_eventManager; } |
84 | } | 86 | } |
85 | 87 | protected EventManager m_eventManager; | |
86 | 88 | ||
87 | protected ScenePermissions m_permissions; | 89 | protected ScenePermissions m_permissions; |
88 | public ScenePermissions Permissions | 90 | public ScenePermissions Permissions |