Merge branch 'master' into careminster-presence-refactor

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f55bd12..3249ae2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9637,10 +9637,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // do that one last, it will cause a ParcelPropertiesUpdate
                     landObject.SetMediaUrl(url);
 
-                    // now send to all (non-child) agents
+                    // now send to all (non-child) agents in the parcel
                     World.ForEachScenePresence(delegate(ScenePresence sp)
                     {
-                        if (!sp.IsChildAgent)
+                        if (!sp.IsChildAgent && (sp.currentParcelUUID == landData.GlobalID))
                         {
                             sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
                                                                           landData.MediaID,
@@ -9670,10 +9670,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // the commandList contained a start/stop/... command, too
                 if (presence == null)
                 {
-                    // send to all (non-child) agents
+                    // send to all (non-child) agents in the parcel
                     World.ForEachScenePresence(delegate(ScenePresence sp)
                     {
-                        if (!sp.IsChildAgent)
+                        if (!sp.IsChildAgent && (sp.currentParcelUUID == landData.GlobalID))
                         {
                             sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
                                                                            (ParcelMediaCommandEnum)commandToSend,