aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-10-22 21:28:10 +0100
committerJustin Clark-Casey (justincc)2010-10-22 21:28:10 +0100
commitcfbaad36691667e08b4b155abf8c8c2cc310dc12 (patch)
tree6d5907d313d006bce0b7d2cd625dfc87205c3786 /OpenSim/Region
parentAllow OARs and IARs to save and load meshes. (diff)
downloadopensim-SC_OLD-cfbaad36691667e08b4b155abf8c8c2cc310dc12.zip
opensim-SC_OLD-cfbaad36691667e08b4b155abf8c8c2cc310dc12.tar.gz
opensim-SC_OLD-cfbaad36691667e08b4b155abf8c8c2cc310dc12.tar.bz2
opensim-SC_OLD-cfbaad36691667e08b4b155abf8c8c2cc310dc12.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.cs8
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,