get rid of PrimitiveBaseShape.MediaRaw staging post

using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself

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
             
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps;
-            m_scene.EventManager.OnSceneObjectLoaded += OnSceneObjectLoaded;
-            m_scene.EventManager.OnSceneObjectPreSave += OnSceneObjectPreSave;
             m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy;
         }
         
@@ -132,8 +130,6 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps;
-            m_scene.EventManager.OnSceneObjectLoaded -= OnSceneObjectLoaded;
-            m_scene.EventManager.OnSceneObjectPreSave -= OnSceneObjectPreSave;
             m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy;
         }        
         
@@ -184,36 +180,6 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             }
         }
         
-        public void OnSceneObjectLoaded(SceneObjectGroup so)
-        {
-//            m_log.DebugFormat("[MOAP]: OnSceneObjectLoaded fired for {0} {1}", so.Name, so.UUID);
-            
-            so.ForEachPart(OnSceneObjectPartLoaded);
-        }
-        
-        public void OnSceneObjectPreSave(SceneObjectGroup persistingSo, SceneObjectGroup originalSo)
-        {
-//            m_log.DebugFormat("[MOAP]: OnSceneObjectPreSave fired for {0} {1}", persistingSo.Name, persistingSo.UUID);            
-            
-            persistingSo.ForEachPart(OnSceneObjectPartPreSave);          
-        }              
-           
-        protected void OnSceneObjectPartLoaded(SceneObjectPart part)
-        {
-            if (null == part.Shape.MediaRaw)
-                return;
-            
-            part.Shape.Media = PrimitiveBaseShape.MediaList.FromXml(part.Shape.MediaRaw);    
-        }
-        
-        protected void OnSceneObjectPartPreSave(SceneObjectPart part)
-        {
-            if (null == part.Shape.Media)
-                return;
- 
-            part.Shape.MediaRaw = part.Shape.Media.ToXml();         
-        }
-        
         protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
         {            
             if (original.Shape.Media != null)