OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove some restrictions on NPCs creation

avinationmerge
UbitUmarov 2015-09-29 22:15:56 +01:00
parent 3e9b326fcc
commit 1124d14eb0
1 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return NpcCreate(firstname, lastname, position, notecard, true, false); return NpcCreate(firstname, lastname, position, notecard, false, false);
} }
public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@ -2589,39 +2589,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return NpcCreate( return NpcCreate(
firstname, lastname, position, notecard, firstname, lastname, position, notecard,
(options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
false); (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
// (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
} }
private LSL_Key NpcCreate( private LSL_Key NpcCreate(
string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent) string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
{ {
if (!owned)
OSSLError("Unowned NPCs are unsupported");
string groupTitle = String.Empty; string groupTitle = String.Empty;
if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z))) if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
return new LSL_Key(UUID.Zero.ToString()); return new LSL_Key(UUID.Zero.ToString());
if (firstname != String.Empty || lastname != String.Empty)
{
if (firstname != "Shown outfit:")
groupTitle = "- NPC -";
}
INPCModule module = World.RequestModuleInterface<INPCModule>(); INPCModule module = World.RequestModuleInterface<INPCModule>();
if (module != null) if (module != null)
{ {
AvatarAppearance appearance = null; AvatarAppearance appearance = null;
// UUID id; UUID id;
// if (UUID.TryParse(notecard, out id)) if (UUID.TryParse(notecard, out id))
// { {
// ScenePresence clonePresence = World.GetScenePresence(id); ScenePresence clonePresence = World.GetScenePresence(id);
// if (clonePresence != null) if (clonePresence != null)
// appearance = clonePresence.Appearance; appearance = clonePresence.Appearance;
// } }
if (appearance == null) if (appearance == null)
{ {
@ -2960,9 +2950,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ManualResetEvent ev = new ManualResetEvent(false);
Util.FireAndForget(delegate(object x) {
try try
{ {
INPCModule module = World.RequestModuleInterface<INPCModule>(); INPCModule module = World.RequestModuleInterface<INPCModule>();
@ -2970,22 +2957,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
UUID npcId = new UUID(npc.m_string); UUID npcId = new UUID(npc.m_string);
ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y);
if (l == null || m_host.OwnerID != l.LandData.OwnerID)
{
if (!module.CheckPermissions(npcId, m_host.OwnerID)) if (!module.CheckPermissions(npcId, m_host.OwnerID))
return; return;
}
module.DeleteNPC(npcId, World); module.DeleteNPC(npcId, World);
} }
} }
finally catch { }
{
ev.Set();
}
});
ev.WaitOne();
} }
public void osNpcPlayAnimation(LSL_Key npc, string animation) public void osNpcPlayAnimation(LSL_Key npc, string animation)