diff options
author | Justin Clarke Casey | 2009-03-05 20:53:23 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-05 20:53:23 +0000 |
commit | 3d70dbd01df8c02dc75c66b470602e93665e91f6 (patch) | |
tree | 431b5bde21d9945f2732cae0f477f417a3028b2a /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | * simplify media and music url setting since we never get back a null land ob... (diff) | |
download | opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.zip opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.gz opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.bz2 opensim-SC_OLD-3d70dbd01df8c02dc75c66b470602e93665e91f6.tar.xz |
* refactor: move media and music url setting from scene into LandObject
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 5 insertions, 3 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(); |