diff options
author | Justin Clark-Casey (justincc) | 2010-07-26 20:13:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-26 23:34:22 +0100 |
commit | 586ae0f6a07358f8367c4f916bff9fd688a43aa3 (patch) | |
tree | f6784a92603ed9e31a235316d32fac9e88c7b075 /OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |
parent | Put a wrapper around the media texture region serialization (diff) | |
download | opensim-SC_OLD-586ae0f6a07358f8367c4f916bff9fd688a43aa3.zip opensim-SC_OLD-586ae0f6a07358f8367c4f916bff9fd688a43aa3.tar.gz opensim-SC_OLD-586ae0f6a07358f8367c4f916bff9fd688a43aa3.tar.bz2 opensim-SC_OLD-586ae0f6a07358f8367c4f916bff9fd688a43aa3.tar.xz |
Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index 0130ff9..2771492 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -98,17 +98,19 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
98 | 98 | ||
99 | public void RegionLoaded(Scene scene) | 99 | public void RegionLoaded(Scene scene) |
100 | { | 100 | { |
101 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 101 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; |
102 | m_scene.EventManager.OnDeregisterCaps += DeregisterCaps; | 102 | m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps; |
103 | m_scene.EventManager.OnSceneObjectLoaded += OnSceneObjectLoaded; | ||
103 | } | 104 | } |
104 | 105 | ||
105 | public void Close() | 106 | public void Close() |
106 | { | 107 | { |
107 | m_scene.EventManager.OnRegisterCaps -= RegisterCaps; | 108 | m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps; |
108 | m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; | 109 | m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps; |
110 | m_scene.EventManager.OnSceneObjectLoaded -= OnSceneObjectLoaded; | ||
109 | } | 111 | } |
110 | 112 | ||
111 | public void RegisterCaps(UUID agentID, Caps caps) | 113 | public void OnRegisterCaps(UUID agentID, Caps caps) |
112 | { | 114 | { |
113 | m_log.DebugFormat( | 115 | m_log.DebugFormat( |
114 | "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID); | 116 | "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID); |
@@ -138,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
138 | } | 140 | } |
139 | } | 141 | } |
140 | 142 | ||
141 | public void DeregisterCaps(UUID agentID, Caps caps) | 143 | public void OnDeregisterCaps(UUID agentID, Caps caps) |
142 | { | 144 | { |
143 | lock (m_omCapUsers) | 145 | lock (m_omCapUsers) |
144 | { | 146 | { |
@@ -155,6 +157,11 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
155 | } | 157 | } |
156 | } | 158 | } |
157 | 159 | ||
160 | public void OnSceneObjectLoaded(SceneObjectGroup sog) | ||
161 | { | ||
162 | m_log.DebugFormat("[MOAP]: OnSceneObjectLoaded fired for {0} {1}", sog.Name, sog.UUID); | ||
163 | } | ||
164 | |||
158 | public MediaEntry GetMediaEntry(SceneObjectPart part, int face) | 165 | public MediaEntry GetMediaEntry(SceneObjectPart part, int face) |
159 | { | 166 | { |
160 | MediaEntry me = null; | 167 | MediaEntry me = null; |