aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs15
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f809ef2..e6cc798 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8058,6 +8058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8058 if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return; 8058 if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return;
8059 8059
8060 bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? 8060 bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)?
8061 byte loop = 0;
8061 8062
8062 LandData landData = landObject.landData; 8063 LandData landData = landObject.landData;
8063 string url = landData.MediaURL; 8064 string url = landData.MediaURL;
@@ -8096,7 +8097,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8096 break; 8097 break;
8097 8098
8098 case ParcelMediaCommandEnum.Loop: 8099 case ParcelMediaCommandEnum.Loop:
8100 loop = 1;
8101 commandToSend = command;
8102 update = true; //need to send the media update packet to set looping
8103 break;
8104
8099 case ParcelMediaCommandEnum.Play: 8105 case ParcelMediaCommandEnum.Play:
8106 loop = 0;
8107 commandToSend = command;
8108 update = true; //need to send the media update packet to make sure it doesn't loop
8109 break;
8110
8100 case ParcelMediaCommandEnum.Pause: 8111 case ParcelMediaCommandEnum.Pause:
8101 case ParcelMediaCommandEnum.Stop: 8112 case ParcelMediaCommandEnum.Stop:
8102 case ParcelMediaCommandEnum.Unload: 8113 case ParcelMediaCommandEnum.Unload:
@@ -8230,7 +8241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8230 mediaType, 8241 mediaType,
8231 description, 8242 description,
8232 width, height, 8243 width, height,
8233 1); // TODO do some LOOP logic here 8244 loop);
8234 } 8245 }
8235 } 8246 }
8236 else if (!presence.IsChildAgent) 8247 else if (!presence.IsChildAgent)
@@ -8242,7 +8253,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8242 mediaType, 8253 mediaType,
8243 description, 8254 description,
8244 width, height, 8255 width, height,
8245 1); // TODO do some LOOP logic here 8256 loop);
8246 } 8257 }
8247 } 8258 }
8248 8259