remove CM api, add replacement ossl functions, as i should had done on the merge of avination code contrib. (runprebuild)
UbitUmarov
parent
d537862cc2
commit
7bcef500a9
|
|
@ -1,129 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Reflection;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Runtime.Remoting.Lifetime;
|
|
||||||
using OpenMetaverse;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.CoreModules.World.LightShare;
|
|
||||||
using OpenSim.Region.Framework.Interfaces;
|
|
||||||
using OpenSim.Region.Framework.Scenes;
|
|
||||||
using OpenSim.Region.ScriptEngine.Shared;
|
|
||||||
using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
|
|
||||||
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
|
|
||||||
using OpenSim.Region.ScriptEngine.Interfaces;
|
|
||||||
using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
|
|
||||||
using OpenSim.Services.Interfaces;
|
|
||||||
|
|
||||||
using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
|
|
||||||
using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
|
|
||||||
using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
|
|
||||||
using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
|
|
||||||
using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
|
|
||||||
using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
|
|
||||||
using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
|
|
||||||
{
|
|
||||||
internal IScriptEngine m_ScriptEngine;
|
|
||||||
internal SceneObjectPart m_host;
|
|
||||||
internal TaskInventoryItem m_item;
|
|
||||||
internal bool m_CMFunctionsEnabled = false;
|
|
||||||
|
|
||||||
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item)
|
|
||||||
{
|
|
||||||
m_ScriptEngine = ScriptEngine;
|
|
||||||
m_host = host;
|
|
||||||
m_item = item;
|
|
||||||
|
|
||||||
if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
|
|
||||||
m_CMFunctionsEnabled = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override Object InitializeLifetimeService()
|
|
||||||
{
|
|
||||||
ILease lease = (ILease)base.InitializeLifetimeService();
|
|
||||||
|
|
||||||
if (lease.CurrentState == LeaseState.Initial)
|
|
||||||
{
|
|
||||||
lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
|
|
||||||
// lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
|
|
||||||
// lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
|
|
||||||
}
|
|
||||||
return lease;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Scene World
|
|
||||||
{
|
|
||||||
get { return m_ScriptEngine.World; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public LSL_Key cmDetectedCountry(int number)
|
|
||||||
{
|
|
||||||
m_host.AddScriptLPS(1);
|
|
||||||
if(!m_CMFunctionsEnabled)
|
|
||||||
return String.Empty;
|
|
||||||
if(World.UserAccountService == null)
|
|
||||||
return String.Empty;
|
|
||||||
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
|
|
||||||
if (detectedParams == null)
|
|
||||||
return String.Empty;
|
|
||||||
UUID key = detectedParams.Key;
|
|
||||||
if(key == UUID.Zero)
|
|
||||||
return String.Empty;
|
|
||||||
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key);
|
|
||||||
return account.UserCountry;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string cmGetAgentCountry(LSL_Key key)
|
|
||||||
{
|
|
||||||
if(! m_CMFunctionsEnabled)
|
|
||||||
return "";
|
|
||||||
if(World.UserAccountService == null)
|
|
||||||
return String.Empty;
|
|
||||||
if (!World.Permissions.IsGod(m_host.OwnerID))
|
|
||||||
return String.Empty;
|
|
||||||
|
|
||||||
UUID uuid;
|
|
||||||
|
|
||||||
if (!UUID.TryParse(key, out uuid))
|
|
||||||
return String.Empty;
|
|
||||||
|
|
||||||
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
|
|
||||||
return account.UserCountry;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -5102,5 +5102,53 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
return m_host.ParentGroup.GetLinkNumPart(linkType);
|
return m_host.ParentGroup.GetLinkNumPart(linkType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// funtions to retrieve user country
|
||||||
|
// adaptation cm* counter parts from Avination Careminster extensions API
|
||||||
|
// included in Avination code contribution
|
||||||
|
// for now users country can only be set directly on DB
|
||||||
|
|
||||||
|
public LSL_String osDetectedCountry(LSL_Integer number)
|
||||||
|
{
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
CheckThreatLevel(ThreatLevel.Moderate, "osDetectedCountry");
|
||||||
|
|
||||||
|
if (World.UserAccountService == null)
|
||||||
|
return String.Empty;
|
||||||
|
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
|
||||||
|
if (detectedParams == null)
|
||||||
|
return String.Empty;
|
||||||
|
UUID key = detectedParams.Key;
|
||||||
|
if (key == UUID.Zero)
|
||||||
|
return String.Empty;
|
||||||
|
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key);
|
||||||
|
return account.UserCountry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LSL_String osGetAgentCountry(LSL_Key id)
|
||||||
|
{
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
CheckThreatLevel(ThreatLevel.Moderate, "osGetAgentCountry");
|
||||||
|
|
||||||
|
if (World.UserAccountService == null)
|
||||||
|
return String.Empty;
|
||||||
|
|
||||||
|
UUID key;
|
||||||
|
if (!UUID.TryParse(id, out key))
|
||||||
|
return String.Empty;
|
||||||
|
if (key == UUID.Zero)
|
||||||
|
return String.Empty;
|
||||||
|
|
||||||
|
//if owner is not god, target must be in region, or nearby regions
|
||||||
|
if (!World.Permissions.IsGod(m_host.OwnerID))
|
||||||
|
{
|
||||||
|
ScenePresence sp = World.GetScenePresence(key);
|
||||||
|
if(sp == null)
|
||||||
|
return String.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key);
|
||||||
|
return account.UserCountry;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System.Collections;
|
|
||||||
using OpenSim.Region.ScriptEngine.Interfaces;
|
|
||||||
|
|
||||||
using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
|
|
||||||
using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
|
|
||||||
using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
|
|
||||||
using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
|
|
||||||
using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
|
|
||||||
using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
|
|
||||||
using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
|
||||||
{
|
|
||||||
public interface ICM_Api
|
|
||||||
{
|
|
||||||
key cmDetectedCountry(int detectedNumber);
|
|
||||||
string cmGetAgentCountry(key agentId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -528,5 +528,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
||||||
void osTriggerSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume);
|
void osTriggerSound(LSL_Integer linknum, LSL_String sound, LSL_Float volume);
|
||||||
void osTriggerSoundLimited(LSL_Integer linknum, LSL_String sound, LSL_Float volume,
|
void osTriggerSoundLimited(LSL_Integer linknum, LSL_String sound, LSL_Float volume,
|
||||||
vector top_north_east, vector bottom_south_west);
|
vector top_north_east, vector bottom_south_west);
|
||||||
|
|
||||||
|
LSL_String osDetectedCountry(LSL_Integer number);
|
||||||
|
LSL_String osGetAgentCountry(LSL_Key agentId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,71 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Runtime.Remoting.Lifetime;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Reflection;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.Framework.Interfaces;
|
|
||||||
using OpenSim.Region.ScriptEngine.Interfaces;
|
|
||||||
using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
|
|
||||||
using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
|
|
||||||
using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
|
|
||||||
using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
|
|
||||||
using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
|
|
||||||
using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
|
|
||||||
using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
|
|
||||||
using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
|
|
||||||
using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|
||||||
{
|
|
||||||
public partial class ScriptBaseClass : MarshalByRefObject
|
|
||||||
{
|
|
||||||
public ICM_Api m_CM_Functions;
|
|
||||||
|
|
||||||
public void ApiTypeCM(IScriptApi api)
|
|
||||||
{
|
|
||||||
if (!(api is ICM_Api))
|
|
||||||
return;
|
|
||||||
|
|
||||||
m_CM_Functions = (ICM_Api)api;
|
|
||||||
}
|
|
||||||
|
|
||||||
public key cmDetectedCountry(int num)
|
|
||||||
{
|
|
||||||
return m_CM_Functions.cmDetectedCountry(num);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string cmGetAgentCountry(key key)
|
|
||||||
{
|
|
||||||
return m_CM_Functions.cmGetAgentCountry(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1282,5 +1282,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
{
|
{
|
||||||
m_OSSL_Functions.osPreloadSound(linknum, sound);
|
m_OSSL_Functions.osPreloadSound(linknum, sound);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LSL_String osDetectedCountry(LSL_Integer number)
|
||||||
|
{
|
||||||
|
return m_OSSL_Functions.osDetectedCountry(number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public LSL_String osGetAgentCountry(LSL_Key agentId)
|
||||||
|
{
|
||||||
|
return m_OSSL_Functions.osGetAgentCountry(agentId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue