diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 6 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 32ebc37..5be967e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6824,7 +6824,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6824 | { | 6824 | { |
6825 | return; | 6825 | return; |
6826 | } | 6826 | } |
6827 | World.SetLandMusicURL(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, url); | 6827 | |
6828 | World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).SetMusicUrl(url); | ||
6829 | |||
6828 | // ScriptSleep(2000); | 6830 | // ScriptSleep(2000); |
6829 | } | 6831 | } |
6830 | 6832 | ||
@@ -8204,11 +8206,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8204 | if (presence == null) | 8206 | if (presence == null) |
8205 | { | 8207 | { |
8206 | // we send to all | 8208 | // we send to all |
8207 | |||
8208 | landData.MediaID = new UUID(texture); | 8209 | landData.MediaID = new UUID(texture); |
8209 | landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0; | 8210 | landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0; |
8211 | |||
8210 | // do that one last, it will cause a ParcelPropertiesUpdate | 8212 | // do that one last, it will cause a ParcelPropertiesUpdate |
8211 | World.SetLandMediaURL(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, url); | 8213 | landObject.SetMediaUrl(url); |
8212 | 8214 | ||
8213 | // now send to all (non-child) agents | 8215 | // now send to all (non-child) agents |
8214 | List<ScenePresence> agents = World.GetAvatars(); | 8216 | List<ScenePresence> agents = World.GetAvatars(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 642b1f9..17732e6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -789,7 +789,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
789 | return; | 789 | return; |
790 | } | 790 | } |
791 | 791 | ||
792 | World.SetLandMediaURL(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, url); | 792 | World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).SetMediaUrl(url); |
793 | } | 793 | } |
794 | 794 | ||
795 | public string osGetScriptEngineName() | 795 | public string osGetScriptEngineName() |