diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index 52acf81..d7ce184 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -120,8 +120,6 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
120 | 120 | ||
121 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; | 121 | m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; |
122 | m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps; | 122 | m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps; |
123 | m_scene.EventManager.OnSceneObjectLoaded += OnSceneObjectLoaded; | ||
124 | m_scene.EventManager.OnSceneObjectPreSave += OnSceneObjectPreSave; | ||
125 | m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy; | 123 | m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy; |
126 | } | 124 | } |
127 | 125 | ||
@@ -132,8 +130,6 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
132 | 130 | ||
133 | m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps; | 131 | m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps; |
134 | m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps; | 132 | m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps; |
135 | m_scene.EventManager.OnSceneObjectLoaded -= OnSceneObjectLoaded; | ||
136 | m_scene.EventManager.OnSceneObjectPreSave -= OnSceneObjectPreSave; | ||
137 | m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy; | 133 | m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy; |
138 | } | 134 | } |
139 | 135 | ||
@@ -184,36 +180,6 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
184 | } | 180 | } |
185 | } | 181 | } |
186 | 182 | ||
187 | public void OnSceneObjectLoaded(SceneObjectGroup so) | ||
188 | { | ||
189 | // m_log.DebugFormat("[MOAP]: OnSceneObjectLoaded fired for {0} {1}", so.Name, so.UUID); | ||
190 | |||
191 | so.ForEachPart(OnSceneObjectPartLoaded); | ||
192 | } | ||
193 | |||
194 | public void OnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo) | ||
195 | { | ||
196 | // m_log.DebugFormat("[MOAP]: OnSceneObjectPreSave fired for {0} {1}", persistingSo.Name, persistingSo.UUID); | ||
197 | |||
198 | persistingSo.ForEachPart(OnSceneObjectPartPreSave); | ||
199 | } | ||
200 | |||
201 | protected void OnSceneObjectPartLoaded(SceneObjectPart part) | ||
202 | { | ||
203 | if (null == part.Shape.MediaRaw) | ||
204 | return; | ||
205 | |||
206 | part.Shape.Media = PrimitiveBaseShape.MediaList.FromXml(part.Shape.MediaRaw); | ||
207 | } | ||
208 | |||
209 | protected void OnSceneObjectPartPreSave(SceneObjectPart part) | ||
210 | { | ||
211 | if (null == part.Shape.Media) | ||
212 | return; | ||
213 | |||
214 | part.Shape.MediaRaw = part.Shape.Media.ToXml(); | ||
215 | } | ||
216 | |||
217 | protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed) | 183 | protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed) |
218 | { | 184 | { |
219 | if (original.Shape.Media != null) | 185 | if (original.Shape.Media != null) |