diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 21:28:10 +0100 |
---|---|---|
committer | Jonathan Freedman | 2010-10-22 18:33:59 -0400 |
commit | d58967be580afa9c349c29261fd7f845faf558e4 (patch) | |
tree | 2c0ee0b0e50077019833977a3c2398f8f00c3204 /OpenSim/Region | |
parent | Allow OARs and IARs to save and load meshes. (diff) | |
download | opensim-SC_OLD-d58967be580afa9c349c29261fd7f845faf558e4.zip opensim-SC_OLD-d58967be580afa9c349c29261fd7f845faf558e4.tar.gz opensim-SC_OLD-d58967be580afa9c349c29261fd7f845faf558e4.tar.bz2 opensim-SC_OLD-d58967be580afa9c349c29261fd7f845faf558e4.tar.xz |
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
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 e6092d4..59a3618 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9101,10 +9101,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9101 | // do that one last, it will cause a ParcelPropertiesUpdate | 9101 | // do that one last, it will cause a ParcelPropertiesUpdate |
9102 | landObject.SetMediaUrl(url); | 9102 | landObject.SetMediaUrl(url); |
9103 | 9103 | ||
9104 | // now send to all (non-child) agents | 9104 | // now send to all (non-child) agents in the parcel |
9105 | World.ForEachScenePresence(delegate(ScenePresence sp) | 9105 | World.ForEachScenePresence(delegate(ScenePresence sp) |
9106 | { | 9106 | { |
9107 | if (!sp.IsChildAgent) | 9107 | if (!sp.IsChildAgent && (sp.currentParcelUUID == landData.GlobalID)) |
9108 | { | 9108 | { |
9109 | sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, | 9109 | sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, |
9110 | landData.MediaID, | 9110 | landData.MediaID, |
@@ -9134,10 +9134,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9134 | // the commandList contained a start/stop/... command, too | 9134 | // the commandList contained a start/stop/... command, too |
9135 | if (presence == null) | 9135 | if (presence == null) |
9136 | { | 9136 | { |
9137 | // send to all (non-child) agents | 9137 | // send to all (non-child) agents in the parcel |
9138 | World.ForEachScenePresence(delegate(ScenePresence sp) | 9138 | World.ForEachScenePresence(delegate(ScenePresence sp) |
9139 | { | 9139 | { |
9140 | if (!sp.IsChildAgent) | 9140 | if (!sp.IsChildAgent && (sp.currentParcelUUID == landData.GlobalID)) |
9141 | { | 9141 | { |
9142 | sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? | 9142 | sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? |
9143 | (ParcelMediaCommandEnum)commandToSend, | 9143 | (ParcelMediaCommandEnum)commandToSend, |