OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fold ClearMediaEntry() back into SetMediaEntry()

0.7.1-dev
Justin Clark-Casey (justincc) 2011-03-05 02:21:53 +00:00
parent 9f85ee29ac
commit 9e579a7891
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
View File

@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
/// </summary> /// </summary>
/// <param name="part">/param> /// <param name="part">/param>
/// <param name="face"></param> /// <param name="face"></param>
/// <param name="me"></param> /// <param name="me">If null, then the media entry is cleared.</param>
public void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me) public void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me)
{ {
// m_log.DebugFormat("[MOAP]: SetMediaEntry for {0}, face {1}", part.Name, face); // m_log.DebugFormat("[MOAP]: SetMediaEntry for {0}, face {1}", part.Name, face);
@ -238,7 +238,12 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
CheckFaceParam(part, face); CheckFaceParam(part, face);
if (null == part.Shape.Media) if (null == part.Shape.Media)
part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]); {
if (me == null)
return;
else
part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
}
lock (part.Shape.Media) lock (part.Shape.Media)
part.Shape.Media[face] = me; part.Shape.Media[face] = me;
@ -248,7 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
// Temporary code to fix llSetPrimMediaParams() bug, pending refactoring // Temporary code to fix llSetPrimMediaParams() bug, pending refactoring
Primitive.TextureEntry te = part.Shape.Textures; Primitive.TextureEntry te = part.Shape.Textures;
Primitive.TextureEntryFace teFace = te.CreateFace((uint)face); Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
teFace.MediaFlags = true; teFace.MediaFlags = me != null;
part.Shape.Textures = te; part.Shape.Textures = te;
part.ScheduleFullUpdate(); part.ScheduleFullUpdate();
@ -262,24 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
/// <param name="face"></param> /// <param name="face"></param>
public void ClearMediaEntry(SceneObjectPart part, int face) public void ClearMediaEntry(SceneObjectPart part, int face)
{ {
CheckFaceParam(part, face); SetMediaEntry(part, face, null);
// If no media has been set up yetthen we don't need to clear anything
if (null == part.Shape.Media)
return;
lock (part.Shape.Media)
part.Shape.Media[face] = null;
UpdateMediaUrl(part, UUID.Zero);
Primitive.TextureEntry te = part.Shape.Textures;
Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
teFace.MediaFlags = false;
part.Shape.Textures = te;
part.ScheduleFullUpdate();
part.TriggerScriptChangedEvent(Changed.MEDIA);
} }
/// <summary> /// <summary>