ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup to last patch from Bill Blight and Vincent (mantis 8738)

Browse Source
This commit is contained in:
UbitUmarov
2020-08-08 18:27:45 +01:00
parent 4eee476423
commit cd5ac2eae9
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -1984,22 +1984,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMusicURL");
ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
if (land != null)
land.SetMusicUrl(url);
}
land.SetMusicUrl(url);
}
public void osSetParcelMediaURL(string url)
public void osSetParcelMediaURL(LSL_String url)
{
// What actually is the difference to the LL function?
//
CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMediaURL");
ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
if (land.LandData.OwnerID != m_host.OwnerID)
return;
land.SetMediaUrl(url);
if (land != null)
land.SetMediaUrl(url);
}
public void osSetParcelSIPAddress(string SIPAddress)

4
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@@ -142,8 +142,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osRegionNotice(string msg);
void osRegionNotice(LSL_Key agentID, string msg);
bool osConsoleCommand(string Command);
void osSetParcelMusicURL(string url);
void osSetParcelMediaURL(string url);
void osSetParcelMusicURL(LSL_String url);
void osSetParcelMediaURL(LSL_String url);
void osSetPrimFloatOnWater(int floatYN);
void osSetParcelSIPAddress(string SIPAddress);

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public partial class ScriptBaseClass
{
// SCRIPTS CONSTANTS
public static readonly LSLInteger OS_APIVERSION = 13;
public static readonly LSLInteger OS_APIVERSION = 14;
public static readonly LSLInteger TRUE = 1;
public static readonly LSLInteger FALSE = 0;

4
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@@ -235,12 +235,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osConsoleCommand(Command);
}
public void osSetParcelMusicURL(string url)
public void osSetParcelMusicURL(LSL_String url)
{
m_OSSL_Functions.osSetParcelMusicURL(url);
}
public void osSetParcelMediaURL(string url)
public void osSetParcelMediaURL(LSL_String url)
{
m_OSSL_Functions.osSetParcelMediaURL(url);
}