diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index e9d723b..339a979 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
219 | 219 | ||
220 | OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml()); | 220 | OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml()); |
221 | 221 | ||
222 | List<MediaEntry> mediaEntries = new List<MediaEntry>(); | 222 | PrimitiveBaseShape.MediaList mediaEntries = new PrimitiveBaseShape.MediaList(); |
223 | foreach (OSD osdMe in osdMeArray) | 223 | foreach (OSD osdMe in osdMeArray) |
224 | { | 224 | { |
225 | MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry()); | 225 | MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry()); |
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
270 | { | 270 | { |
271 | if (original.Shape.Media != null) | 271 | if (original.Shape.Media != null) |
272 | { | 272 | { |
273 | List<MediaEntry> dupeMedia = new List<MediaEntry>(); | 273 | PrimitiveBaseShape.MediaList dupeMedia = new PrimitiveBaseShape.MediaList(); |
274 | 274 | ||
275 | foreach (MediaEntry me in original.Shape.Media) | 275 | foreach (MediaEntry me in original.Shape.Media) |
276 | { | 276 | { |
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
315 | CheckFaceParam(part, face); | 315 | CheckFaceParam(part, face); |
316 | 316 | ||
317 | if (null == part.Shape.Media) | 317 | if (null == part.Shape.Media) |
318 | part.Shape.Media = new List<MediaEntry>(new MediaEntry[part.GetNumberOfSides()]); | 318 | part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]); |
319 | 319 | ||
320 | part.Shape.Media[face] = me; | 320 | part.Shape.Media[face] = me; |
321 | UpdateMediaUrl(part, UUID.Zero); | 321 | UpdateMediaUrl(part, UUID.Zero); |
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
439 | if (null == media) | 439 | if (null == media) |
440 | { | 440 | { |
441 | // m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name); | 441 | // m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name); |
442 | part.Shape.Media = new List<MediaEntry>(omu.FaceMedia); | 442 | part.Shape.Media = new PrimitiveBaseShape.MediaList(omu.FaceMedia); |
443 | 443 | ||
444 | for (int i = 0; i < omu.FaceMedia.Length; i++) | 444 | for (int i = 0; i < omu.FaceMedia.Length; i++) |
445 | { | 445 | { |