diff options
author | Justin Clark-Casey (justincc) | 2010-07-12 22:27:11 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-12 22:27:11 +0100 |
commit | 55caab1efdf9a397141d6e56193dff4513107d95 (patch) | |
tree | 90ba4fcae971a84f95da50f721b534211f290702 /OpenSim/Region | |
parent | implement llClearPrimMedia() (diff) | |
download | opensim-SC-55caab1efdf9a397141d6e56193dff4513107d95.zip opensim-SC-55caab1efdf9a397141d6e56193dff4513107d95.tar.gz opensim-SC-55caab1efdf9a397141d6e56193dff4513107d95.tar.bz2 opensim-SC-55caab1efdf9a397141d6e56193dff4513107d95.tar.xz |
Fire CHANGED_MEDIA event if a media texture is set or cleared
Diffstat (limited to '')
3 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index 8699800..8bccab4 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -127,6 +127,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
127 | part.Shape.Media[face] = me; | 127 | part.Shape.Media[face] = me; |
128 | UpdateMediaUrl(part); | 128 | UpdateMediaUrl(part); |
129 | part.ScheduleFullUpdate(); | 129 | part.ScheduleFullUpdate(); |
130 | part.TriggerScriptChangedEvent(Changed.MEDIA); | ||
130 | } | 131 | } |
131 | 132 | ||
132 | public void ClearMediaEntry(SceneObjectPart part, int face) | 133 | public void ClearMediaEntry(SceneObjectPart part, int face) |
@@ -233,6 +234,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
233 | // Arguably, we could avoid sending a full update to the avatar that just changed the texture. | 234 | // Arguably, we could avoid sending a full update to the avatar that just changed the texture. |
234 | part.ScheduleFullUpdate(); | 235 | part.ScheduleFullUpdate(); |
235 | 236 | ||
237 | part.TriggerScriptChangedEvent(Changed.MEDIA); | ||
238 | |||
236 | return string.Empty; | 239 | return string.Empty; |
237 | } | 240 | } |
238 | 241 | ||
@@ -277,6 +280,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
277 | 280 | ||
278 | part.ScheduleFullUpdate(); | 281 | part.ScheduleFullUpdate(); |
279 | 282 | ||
283 | part.TriggerScriptChangedEvent(Changed.MEDIA); | ||
284 | |||
280 | return string.Empty; | 285 | return string.Empty; |
281 | } | 286 | } |
282 | 287 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 8830fb0..3165f4d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -58,7 +58,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
58 | OWNER = 128, | 58 | OWNER = 128, |
59 | REGION_RESTART = 256, | 59 | REGION_RESTART = 256, |
60 | REGION = 512, | 60 | REGION = 512, |
61 | TELEPORT = 1024 | 61 | TELEPORT = 1024, |
62 | MEDIA = 2048 | ||
62 | } | 63 | } |
63 | 64 | ||
64 | // I don't really know where to put this except here. | 65 | // I don't really know where to put this except here. |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 6ef786a..06f9426 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -276,6 +276,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
276 | public const int CHANGED_REGION_RESTART = 256; | 276 | public const int CHANGED_REGION_RESTART = 256; |
277 | public const int CHANGED_REGION = 512; | 277 | public const int CHANGED_REGION = 512; |
278 | public const int CHANGED_TELEPORT = 1024; | 278 | public const int CHANGED_TELEPORT = 1024; |
279 | public const int CHANGED_MEDIA = 2048; | ||
279 | public const int CHANGED_ANIMATION = 16384; | 280 | public const int CHANGED_ANIMATION = 16384; |
280 | public const int TYPE_INVALID = 0; | 281 | public const int TYPE_INVALID = 0; |
281 | public const int TYPE_INTEGER = 1; | 282 | public const int TYPE_INTEGER = 1; |