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

Instead of constantly looking up unchanging self item in script code, pass in self item on initialization.

0.7.4.1
Justin Clark-Casey (justincc) 2012-05-08 22:58:34 +01:00
parent abbd050a13
commit 01b78235db
10 changed files with 145 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
View File

@ -27,17 +27,23 @@
using System; using System;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ScriptEngine.Interfaces namespace OpenSim.Region.ScriptEngine.Interfaces
{ {
public interface IScriptApi public interface IScriptApi
{ {
// /// <summary>
// Each API has an identifier, which is used to load the /// Initialize the API
// proper runtime assembly at load time. /// </summary>
// /// <remarks>
void Initialize(IScriptEngine engine, SceneObjectPart part, uint localID, UUID item); /// Each API has an identifier, which is used to load the
/// proper runtime assembly at load time.
/// <param name='engine'>/param>
/// <param name='part'></param>
/// <param name='localID'></param>
/// <param name='item'></param>
void Initialize(IScriptEngine engine, SceneObjectPart part, uint localID, TaskInventoryItem item);
} }
} }

244
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -87,9 +87,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected uint m_localID; protected uint m_localID;
/// <summary> /// <summary>
/// The UUID of the item that hosts this script /// The item that hosts this script
/// </summary> /// </summary>
protected UUID m_itemID; protected TaskInventoryItem m_item;
protected bool throwErrorOnNotImplemented = true; protected bool throwErrorOnNotImplemented = true;
protected AsyncCommandManager AsyncCommands = null; protected AsyncCommandManager AsyncCommands = null;
@ -108,12 +108,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
new Dictionary<UUID, UserInfoCacheEntry>(); new Dictionary<UUID, UserInfoCacheEntry>();
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, TaskInventoryItem item)
{ {
m_ScriptEngine = ScriptEngine; m_ScriptEngine = ScriptEngine;
m_host = host; m_host = host;
m_localID = localID; m_localID = localID;
m_itemID = itemID; m_item = item;
m_ScriptDelayFactor = m_ScriptDelayFactor =
m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
@ -163,7 +163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void state(string newState) public void state(string newState)
{ {
m_ScriptEngine.SetState(m_itemID, newState); m_ScriptEngine.SetState(m_item.ItemID, newState);
} }
/// <summary> /// <summary>
@ -173,7 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llResetScript() public void llResetScript()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_ScriptEngine.ApiResetScript(m_itemID); m_ScriptEngine.ApiResetScript(m_item.ItemID);
} }
public void llResetOtherScript(string name) public void llResetOtherScript(string name)
@ -272,20 +272,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
/// <summary>
/// Get the inventory item that hosts ourselves.
/// </summary>
/// <remarks>
/// FIXME: It would be far easier to pass in TaskInventoryItem rather than just m_itemID so that we don't need
/// to keep looking ourselves up.
/// </remarks>
/// <returns></returns>
protected TaskInventoryItem GetSelfInventoryItem()
{
lock (m_host.TaskInventory)
return m_host.TaskInventory[m_itemID];
}
protected UUID InventoryKey(string name, int type) protected UUID InventoryKey(string name, int type)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -857,7 +843,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID.TryParse(ID, out keyID); UUID.TryParse(ID, out keyID);
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
if (wComm != null) if (wComm != null)
return wComm.Listen(m_localID, m_itemID, m_host.UUID, channelID, name, keyID, msg); return wComm.Listen(m_localID, m_item.ItemID, m_host.UUID, channelID, name, keyID, msg);
else else
return -1; return -1;
} }
@ -867,7 +853,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
if (wComm != null) if (wComm != null)
wComm.ListenControl(m_itemID, number, active); wComm.ListenControl(m_item.ItemID, number, active);
} }
public void llListenRemove(int number) public void llListenRemove(int number)
@ -875,7 +861,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
if (wComm != null) if (wComm != null)
wComm.ListenRemove(m_itemID, number); wComm.ListenRemove(m_item.ItemID, number);
} }
public void llSensor(string name, string id, int type, double range, double arc) public void llSensor(string name, string id, int type, double range, double arc)
@ -884,7 +870,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID keyID = UUID.Zero; UUID keyID = UUID.Zero;
UUID.TryParse(id, out keyID); UUID.TryParse(id, out keyID);
AsyncCommands.SensorRepeatPlugin.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); AsyncCommands.SensorRepeatPlugin.SenseOnce(m_localID, m_item.ItemID, name, keyID, type, range, arc, m_host);
} }
public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate)
@ -893,13 +879,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID keyID = UUID.Zero; UUID keyID = UUID.Zero;
UUID.TryParse(id, out keyID); UUID.TryParse(id, out keyID);
AsyncCommands.SensorRepeatPlugin.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host); AsyncCommands.SensorRepeatPlugin.SetSenseRepeatEvent(m_localID, m_item.ItemID, name, keyID, type, range, arc, rate, m_host);
} }
public void llSensorRemove() public void llSensorRemove()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
AsyncCommands.SensorRepeatPlugin.UnSetSenseRepeaterEvents(m_localID, m_itemID); AsyncCommands.SensorRepeatPlugin.UnSetSenseRepeaterEvents(m_localID, m_item.ItemID);
} }
public string resolveName(UUID objecUUID) public string resolveName(UUID objecUUID)
@ -940,7 +926,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_String llDetectedName(int number) public LSL_String llDetectedName(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return String.Empty; return String.Empty;
return detectedParams.Name; return detectedParams.Name;
@ -949,7 +935,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_String llDetectedKey(int number) public LSL_String llDetectedKey(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return String.Empty; return String.Empty;
return detectedParams.Key.ToString(); return detectedParams.Key.ToString();
@ -958,7 +944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_String llDetectedOwner(int number) public LSL_String llDetectedOwner(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return String.Empty; return String.Empty;
return detectedParams.Owner.ToString(); return detectedParams.Owner.ToString();
@ -967,7 +953,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llDetectedType(int number) public LSL_Integer llDetectedType(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return 0; return 0;
return new LSL_Integer(detectedParams.Type); return new LSL_Integer(detectedParams.Type);
@ -976,7 +962,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedPos(int number) public LSL_Vector llDetectedPos(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(); return new LSL_Vector();
return detectedParams.Position; return detectedParams.Position;
@ -985,7 +971,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedVel(int number) public LSL_Vector llDetectedVel(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(); return new LSL_Vector();
return detectedParams.Velocity; return detectedParams.Velocity;
@ -994,7 +980,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedGrab(int number) public LSL_Vector llDetectedGrab(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams parms = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (parms == null) if (parms == null)
return new LSL_Vector(0, 0, 0); return new LSL_Vector(0, 0, 0);
@ -1004,7 +990,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Rotation llDetectedRot(int number) public LSL_Rotation llDetectedRot(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Rotation(); return new LSL_Rotation();
return detectedParams.Rotation; return detectedParams.Rotation;
@ -1013,7 +999,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llDetectedGroup(int number) public LSL_Integer llDetectedGroup(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Integer(0); return new LSL_Integer(0);
if (m_host.GroupID == detectedParams.Group) if (m_host.GroupID == detectedParams.Group)
@ -1024,7 +1010,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llDetectedLinkNumber(int number) public LSL_Integer llDetectedLinkNumber(int number)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams parms = m_ScriptEngine.GetDetectParams(m_itemID, number); DetectParams parms = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (parms == null) if (parms == null)
return new LSL_Integer(0); return new LSL_Integer(0);
@ -1037,7 +1023,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedTouchBinormal(int index) public LSL_Vector llDetectedTouchBinormal(int index)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(); return new LSL_Vector();
return detectedParams.TouchBinormal; return detectedParams.TouchBinormal;
@ -1049,7 +1035,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llDetectedTouchFace(int index) public LSL_Integer llDetectedTouchFace(int index)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Integer(-1); return new LSL_Integer(-1);
return new LSL_Integer(detectedParams.TouchFace); return new LSL_Integer(detectedParams.TouchFace);
@ -1061,7 +1047,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedTouchNormal(int index) public LSL_Vector llDetectedTouchNormal(int index)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(); return new LSL_Vector();
return detectedParams.TouchNormal; return detectedParams.TouchNormal;
@ -1073,7 +1059,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedTouchPos(int index) public LSL_Vector llDetectedTouchPos(int index)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(); return new LSL_Vector();
return detectedParams.TouchPos; return detectedParams.TouchPos;
@ -1085,7 +1071,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedTouchST(int index) public LSL_Vector llDetectedTouchST(int index)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(-1.0, -1.0, 0.0); return new LSL_Vector(-1.0, -1.0, 0.0);
return detectedParams.TouchST; return detectedParams.TouchST;
@ -1097,7 +1083,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector llDetectedTouchUV(int index) public LSL_Vector llDetectedTouchUV(int index)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, index); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, index);
if (detectedParams == null) if (detectedParams == null)
return new LSL_Vector(-1.0, -1.0, 0.0); return new LSL_Vector(-1.0, -1.0, 0.0);
return detectedParams.TouchUV; return detectedParams.TouchUV;
@ -2702,12 +2688,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter == UUID.Zero)
if (item.PermsGranter == UUID.Zero)
return 0; return 0;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
{ {
LSLError("No permissions to give money"); LSLError("No permissions to give money");
return 0; return 0;
@ -2890,7 +2874,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
sec = m_MinTimerInterval; sec = m_MinTimerInterval;
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// Setting timer repeat // Setting timer repeat
AsyncCommands.TimerPlugin.SetTimerEvent(m_localID, m_itemID, sec); AsyncCommands.TimerPlugin.SetTimerEvent(m_localID, m_item.ItemID, sec);
} }
public virtual void llSleep(double sec) public virtual void llSleep(double sec)
@ -2945,17 +2929,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llTakeControls(int controls, int accept, int pass_on) public void llTakeControls(int controls, int accept, int pass_on)
{ {
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter != UUID.Zero)
if (item.PermsGranter != UUID.Zero)
{ {
ScenePresence presence = World.GetScenePresence(item.PermsGranter); ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence != null) if (presence != null)
{ {
if ((item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
{ {
presence.RegisterControlEventsToScript(controls, accept, pass_on, m_localID, m_itemID); presence.RegisterControlEventsToScript(controls, accept, pass_on, m_localID, m_item.ItemID);
} }
} }
} }
@ -2967,20 +2949,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter != UUID.Zero)
if (item.PermsGranter != UUID.Zero)
{ {
ScenePresence presence = World.GetScenePresence(item.PermsGranter); ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence != null) if (presence != null)
{ {
if ((item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
{ {
// Unregister controls from Presence // Unregister controls from Presence
presence.UnRegisterControlEventsToScript(m_localID, m_itemID); presence.UnRegisterControlEventsToScript(m_localID, m_item.ItemID);
// Remove Take Control permission. // Remove Take Control permission.
item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS; m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
} }
} }
} }
@ -3042,12 +3022,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// if (m_host.ParentGroup.RootPart.AttachmentPoint == 0) // if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
// return; // return;
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter != m_host.OwnerID)
if (item.PermsGranter != m_host.OwnerID)
return; return;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
AttachToAvatar(attachmentPoint); AttachToAvatar(attachmentPoint);
} }
@ -3058,12 +3036,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_host.ParentGroup.AttachmentPoint == 0) if (m_host.ParentGroup.AttachmentPoint == 0)
return; return;
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter != m_host.OwnerID)
if (item.PermsGranter != m_host.OwnerID)
return; return;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0)
DetachFromAvatar(); DetachFromAvatar();
} }
@ -3245,7 +3221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
try try
{ {
m_ScriptEngine.SetMinEventDelay(m_itemID, delay); m_ScriptEngine.SetMinEventDelay(m_item.ItemID, delay);
} }
catch (NotImplementedException) catch (NotImplementedException)
{ {
@ -3298,14 +3274,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter == UUID.Zero)
if (item.PermsGranter == UUID.Zero)
return; return;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
{ {
ScenePresence presence = World.GetScenePresence(item.PermsGranter); ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence != null) if (presence != null)
{ {
@ -3323,21 +3297,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter == UUID.Zero)
if (item.PermsGranter == UUID.Zero)
return; return;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
{ {
UUID animID = new UUID(); UUID animID = new UUID();
if (!UUID.TryParse(anim, out animID)) if (!UUID.TryParse(anim, out animID))
{ {
animID=InventoryKey(anim); animID = InventoryKey(anim);
} }
ScenePresence presence = World.GetScenePresence(item.PermsGranter); ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence != null) if (presence != null)
{ {
@ -3373,7 +3345,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llGetStartParameter() public LSL_Integer llGetStartParameter()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return m_ScriptEngine.GetStartParameter(m_itemID); return m_ScriptEngine.GetStartParameter(m_item.ItemID);
} }
public void llRequestPermissions(string agent, int perm) public void llRequestPermissions(string agent, int perm)
@ -3383,16 +3355,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(agent, out agentID)) if (!UUID.TryParse(agent, out agentID))
return; return;
TaskInventoryItem item = GetSelfInventoryItem();
if (agentID == UUID.Zero || perm == 0) // Releasing permissions if (agentID == UUID.Zero || perm == 0) // Releasing permissions
{ {
llReleaseControls(); llReleaseControls();
item.PermsGranter = UUID.Zero; m_item.PermsGranter = UUID.Zero;
item.PermsMask = 0; m_item.PermsMask = 0;
m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
"run_time_permissions", new Object[] { "run_time_permissions", new Object[] {
new LSL_Integer(0) }, new LSL_Integer(0) },
new DetectParams[0])); new DetectParams[0]));
@ -3400,7 +3370,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
} }
if (item.PermsGranter != agentID || (perm & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) if (m_item.PermsGranter != agentID || (perm & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
llReleaseControls(); llReleaseControls();
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -3417,11 +3387,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
lock (m_host.TaskInventory) lock (m_host.TaskInventory)
{ {
m_host.TaskInventory[m_itemID].PermsGranter = agentID; m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
m_host.TaskInventory[m_itemID].PermsMask = perm; m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
} }
m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
"run_time_permissions", new Object[] { "run_time_permissions", new Object[] {
new LSL_Integer(perm) }, new LSL_Integer(perm) },
new DetectParams[0])); new DetectParams[0]));
@ -3441,11 +3411,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
lock (m_host.TaskInventory) lock (m_host.TaskInventory)
{ {
m_host.TaskInventory[m_itemID].PermsGranter = agentID; m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
m_host.TaskInventory[m_itemID].PermsMask = perm; m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
} }
m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
"run_time_permissions", new Object[] { "run_time_permissions", new Object[] {
new LSL_Integer(perm) }, new LSL_Integer(perm) },
new DetectParams[0])); new DetectParams[0]));
@ -3466,8 +3436,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
lock (m_host.TaskInventory) lock (m_host.TaskInventory)
{ {
m_host.TaskInventory[m_itemID].PermsGranter = agentID; m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
m_host.TaskInventory[m_itemID].PermsMask = 0; m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
} }
presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
@ -3475,13 +3445,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
presence.ControllingClient.SendScriptQuestion( presence.ControllingClient.SendScriptQuestion(
m_host.UUID, m_host.ParentGroup.RootPart.Name, ownerName, m_itemID, perm); m_host.UUID, m_host.ParentGroup.RootPart.Name, ownerName, m_item.ItemID, perm);
return; return;
} }
// Requested agent is not in range, refuse perms // Requested agent is not in range, refuse perms
m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
"run_time_permissions", new Object[] { "run_time_permissions", new Object[] {
new LSL_Integer(0) }, new LSL_Integer(0) },
new DetectParams[0])); new DetectParams[0]));
@ -3500,10 +3470,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
lock (m_host.TaskInventory) lock (m_host.TaskInventory)
{ {
m_host.TaskInventory[m_itemID].PermsMask = answer; m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
} }
m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
"run_time_permissions", new Object[] { "run_time_permissions", new Object[] {
new LSL_Integer(answer) }, new LSL_Integer(answer) },
new DetectParams[0])); new DetectParams[0]));
@ -3513,14 +3483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return GetSelfInventoryItem().PermsGranter.ToString(); return m_item.PermsGranter.ToString();
} }
public LSL_Integer llGetPermissions() public LSL_Integer llGetPermissions()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
int perms = GetSelfInventoryItem().PermsMask; int perms = m_item.PermsMask;
if (m_automaticLinkPermission) if (m_automaticLinkPermission)
perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
@ -3558,9 +3528,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(target, out targetID)) if (!UUID.TryParse(target, out targetID))
return; return;
TaskInventoryItem item = GetSelfInventoryItem(); if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
&& !m_automaticLinkPermission) && !m_automaticLinkPermission)
{ {
ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
@ -3568,7 +3536,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
IClientAPI client = null; IClientAPI client = null;
ScenePresence sp = World.GetScenePresence(item.PermsGranter); ScenePresence sp = World.GetScenePresence(m_item.PermsGranter);
if (sp != null) if (sp != null)
client = sp.ControllingClient; client = sp.ControllingClient;
@ -3615,7 +3583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if ((GetSelfInventoryItem().PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
&& !m_automaticLinkPermission) && !m_automaticLinkPermission)
{ {
ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
@ -3986,7 +3954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
if (item.Name == name) if (item.Name == name)
{ {
if (item.ItemID == m_itemID) if (item.ItemID == m_item.ItemID)
throw new ScriptDeleteException(); throw new ScriptDeleteException();
else else
m_host.Inventory.RemoveInventoryItem(item.ItemID); m_host.Inventory.RemoveInventoryItem(item.ItemID);
@ -4122,7 +4090,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID tid = AsyncCommands. UUID tid = AsyncCommands.
DataserverPlugin.RegisterRequest(m_localID, DataserverPlugin.RegisterRequest(m_localID,
m_itemID, rq.ToString()); m_item.ItemID, rq.ToString());
AsyncCommands. AsyncCommands.
DataserverPlugin.DataserverReply(rq.ToString(), reply); DataserverPlugin.DataserverReply(rq.ToString(), reply);
@ -4143,7 +4111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
UUID tid = AsyncCommands. UUID tid = AsyncCommands.
DataserverPlugin.RegisterRequest(m_localID, DataserverPlugin.RegisterRequest(m_localID,
m_itemID, item.AssetID.ToString()); m_item.ItemID, item.AssetID.ToString());
Vector3 region = new Vector3( Vector3 region = new Vector3(
World.RegionInfo.RegionLocX * Constants.RegionSize, World.RegionInfo.RegionLocX * Constants.RegionSize,
@ -4498,9 +4466,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); return m_item.Name != null ? m_item.Name : String.Empty;
return item.Name != null ? item.Name : String.Empty;
} }
public LSL_Integer llGetLinkNumberOfSides(int link) public LSL_Integer llGetLinkNumberOfSides(int link)
@ -6598,14 +6564,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
if (xmlrpcMod.IsEnabled()) if (xmlrpcMod.IsEnabled())
{ {
UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID, UUID.Zero); UUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_item.ItemID, UUID.Zero);
IXmlRpcRouter xmlRpcRouter = m_ScriptEngine.World.RequestModuleInterface<IXmlRpcRouter>(); IXmlRpcRouter xmlRpcRouter = m_ScriptEngine.World.RequestModuleInterface<IXmlRpcRouter>();
if (xmlRpcRouter != null) if (xmlRpcRouter != null)
{ {
string ExternalHostName = m_ScriptEngine.World.RegionInfo.ExternalHostName; string ExternalHostName = m_ScriptEngine.World.RegionInfo.ExternalHostName;
xmlRpcRouter.RegisterNewReceiver(m_ScriptEngine.ScriptModule, channelID, m_host.UUID, xmlRpcRouter.RegisterNewReceiver(m_ScriptEngine.ScriptModule, channelID, m_host.UUID,
m_itemID, String.Format("http://{0}:{1}/", ExternalHostName, m_item.ItemID, String.Format("http://{0}:{1}/", ExternalHostName,
xmlrpcMod.Port.ToString())); xmlrpcMod.Port.ToString()));
} }
object[] resobj = new object[] object[] resobj = new object[]
@ -6617,7 +6583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
new LSL_Integer(0), new LSL_Integer(0),
new LSL_String(String.Empty) new LSL_String(String.Empty)
}; };
m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams("remote_data", resobj, m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj,
new DetectParams[0])); new DetectParams[0]));
} }
ScriptSleep(1000); ScriptSleep(1000);
@ -6628,7 +6594,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
ScriptSleep(3000); ScriptSleep(3000);
return (xmlrpcMod.SendRemoteData(m_localID, m_itemID, channel, dest, idata, sdata)).ToString(); return (xmlrpcMod.SendRemoteData(m_localID, m_item.ItemID, channel, dest, idata, sdata)).ToString();
} }
public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) public void llRemoteDataReply(string channel, string message_id, string sdata, int idata)
@ -9049,13 +9015,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if (m_UrlModule != null) if (m_UrlModule != null)
return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_itemID).ToString(); return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID).ToString();
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
public LSL_String llRequestSimulatorData(string simulator, int data) public LSL_String llRequestSimulatorData(string simulator, int data)
{ {
IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL");
try try
{ {
@ -9117,7 +9083,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID rq = UUID.Random(); UUID rq = UUID.Random();
UUID tid = AsyncCommands. UUID tid = AsyncCommands.
DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); DataserverPlugin.RegisterRequest(m_localID, m_item.ItemID, rq.ToString());
AsyncCommands. AsyncCommands.
DataserverPlugin.DataserverReply(rq.ToString(), reply); DataserverPlugin.DataserverReply(rq.ToString(), reply);
@ -9136,7 +9102,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if (m_UrlModule != null) if (m_UrlModule != null)
return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_itemID).ToString(); return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID).ToString();
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
@ -9602,12 +9568,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter == UUID.Zero)
if (item.PermsGranter == UUID.Zero)
return new LSL_Vector(); return new LSL_Vector();
if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
{ {
ShoutError("No permissions to track the camera"); ShoutError("No permissions to track the camera");
return new LSL_Vector(); return new LSL_Vector();
@ -9626,12 +9590,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
TaskInventoryItem item = GetSelfInventoryItem(); if (m_item.PermsGranter == UUID.Zero)
if (item.PermsGranter == UUID.Zero)
return new LSL_Rotation(); return new LSL_Rotation();
if ((item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
{ {
ShoutError("No permissions to track the camera"); ShoutError("No permissions to track the camera");
return new LSL_Rotation(); return new LSL_Rotation();
@ -9696,7 +9658,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector lookAt) public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector lookAt)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0);
if (detectedParams == null) return; // only works on the first detected avatar if (detectedParams == null) return; // only works on the first detected avatar
ScenePresence avatar = World.GetScenePresence(detectedParams.Key); ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
@ -9813,15 +9775,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (objectID == UUID.Zero) if (objectID == UUID.Zero)
return; return;
TaskInventoryItem item = GetSelfInventoryItem();
// we need the permission first, to know which avatar we want to set the camera for // we need the permission first, to know which avatar we want to set the camera for
UUID agentID = item.PermsGranter; UUID agentID = m_item.PermsGranter;
if (agentID == UUID.Zero) if (agentID == UUID.Zero)
return; return;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
return; return;
ScenePresence presence = World.GetScenePresence(agentID); ScenePresence presence = World.GetScenePresence(agentID);
@ -9867,15 +9827,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (objectID == UUID.Zero) if (objectID == UUID.Zero)
return; return;
TaskInventoryItem item = GetSelfInventoryItem();
// we need the permission first, to know which avatar we want to clear the camera for // we need the permission first, to know which avatar we want to clear the camera for
UUID agentID = item.PermsGranter; UUID agentID = m_item.PermsGranter;
if (agentID == UUID.Zero) if (agentID == UUID.Zero)
return; return;
if ((item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
return; return;
ScenePresence presence = World.GetScenePresence(agentID); ScenePresence presence = World.GetScenePresence(agentID);
@ -10025,7 +9983,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
UUID reqID = httpScriptMod. UUID reqID = httpScriptMod.
StartHttpRequest(m_localID, m_itemID, url, param, httpHeaders, body); StartHttpRequest(m_localID, m_item.ItemID, url, param, httpHeaders, body);
if (reqID != UUID.Zero) if (reqID != UUID.Zero)
return reqID.ToString(); return reqID.ToString();
@ -10455,7 +10413,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
// was: UUID tid = tid = AsyncCommands. // was: UUID tid = tid = AsyncCommands.
UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, assetID.ToString()); UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_item.ItemID, assetID.ToString());
if (NotecardCache.IsCached(assetID)) if (NotecardCache.IsCached(assetID))
{ {
@ -10517,7 +10475,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
// was: UUID tid = tid = AsyncCommands. // was: UUID tid = tid = AsyncCommands.
UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, assetID.ToString()); UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_item.ItemID, assetID.ToString());
if (NotecardCache.IsCached(assetID)) if (NotecardCache.IsCached(assetID))
{ {
@ -10575,7 +10533,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void print(string str) public void print(string str)
{ {
// yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print
IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL");
if (ossl != null) if (ossl != null)
{ {
ossl.CheckThreatLevel(ThreatLevel.High, "print"); ossl.CheckThreatLevel(ThreatLevel.High, "print");
@ -10603,7 +10561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
UUID rq = UUID.Random(); UUID rq = UUID.Random();
AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_item.ItemID, rq.ToString());
AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id))); AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id)));
@ -10619,7 +10577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
UUID rq = UUID.Random(); UUID rq = UUID.Random();
AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_item.ItemID, rq.ToString());
AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id)); AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id));

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
View File

@ -59,16 +59,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
internal IScriptEngine m_ScriptEngine; internal IScriptEngine m_ScriptEngine;
internal SceneObjectPart m_host; internal SceneObjectPart m_host;
internal uint m_localID; internal uint m_localID;
internal UUID m_itemID;
internal bool m_LSFunctionsEnabled = false; internal bool m_LSFunctionsEnabled = false;
internal IScriptModuleComms m_comms = null; internal IScriptModuleComms m_comms = null;
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, TaskInventoryItem item)
{ {
m_ScriptEngine = ScriptEngine; m_ScriptEngine = ScriptEngine;
m_host = host; m_host = host;
m_localID = localID; m_localID = localID;
m_itemID = itemID;
if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false)) if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
m_LSFunctionsEnabled = true; m_LSFunctionsEnabled = true;

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
View File

@ -58,16 +58,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
internal IScriptEngine m_ScriptEngine; internal IScriptEngine m_ScriptEngine;
internal SceneObjectPart m_host; internal SceneObjectPart m_host;
internal uint m_localID; internal uint m_localID;
internal UUID m_itemID; internal TaskInventoryItem m_item;
internal bool m_MODFunctionsEnabled = false; internal bool m_MODFunctionsEnabled = false;
internal IScriptModuleComms m_comms = null; internal IScriptModuleComms m_comms = null;
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, TaskInventoryItem item)
{ {
m_ScriptEngine = ScriptEngine; m_ScriptEngine = ScriptEngine;
m_host = host; m_host = host;
m_localID = localID; m_localID = localID;
m_itemID = itemID; m_item = item;
if (m_ScriptEngine.Config.GetBoolean("AllowMODFunctions", false)) if (m_ScriptEngine.Config.GetBoolean("AllowMODFunctions", false))
m_MODFunctionsEnabled = true; m_MODFunctionsEnabled = true;
@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// non-null but don't trust it completely // non-null but don't trust it completely
try try
{ {
object result = m_comms.InvokeOperation(m_host.UUID, m_itemID, fname, convertedParms); object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms);
if (result != null) if (result != null)
return result; return result;
@ -279,7 +279,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID req = UUID.Random(); UUID req = UUID.Random();
m_comms.RaiseEvent(m_itemID, req.ToString(), module, command, k); m_comms.RaiseEvent(m_item.ItemID, req.ToString(), module, command, k);
return req.ToString(); return req.ToString();
} }

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

@ -134,19 +134,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there
internal SceneObjectPart m_host; internal SceneObjectPart m_host;
internal uint m_localID; internal uint m_localID;
internal UUID m_itemID; internal TaskInventoryItem m_item;
internal bool m_OSFunctionsEnabled = false; internal bool m_OSFunctionsEnabled = false;
internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
internal float m_ScriptDelayFactor = 1.0f; internal float m_ScriptDelayFactor = 1.0f;
internal float m_ScriptDistanceFactor = 1.0f; internal float m_ScriptDistanceFactor = 1.0f;
internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, TaskInventoryItem item)
{ {
m_ScriptEngine = ScriptEngine; m_ScriptEngine = ScriptEngine;
m_host = host; m_host = host;
m_localID = localID; m_localID = localID;
m_itemID = itemID; m_item = item;
if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
m_OSFunctionsEnabled = true; m_OSFunctionsEnabled = true;
@ -224,7 +224,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_LSL_Api != null) if (m_LSL_Api != null)
return; return;
m_LSL_Api = (ILSL_Api)m_ScriptEngine.GetApi(m_itemID, "LSL"); m_LSL_Api = (ILSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "LSL");
} }
// //
@ -343,22 +343,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
} }
TaskInventoryItem ti = m_host.Inventory.GetInventoryItem(m_itemID); UUID ownerID = m_item.OwnerID;
if (ti == null)
{
OSSLError(
String.Format("{0} permission error. Can't find script in prim inventory.",
function));
}
UUID ownerID = ti.OwnerID;
//OSSL only may be used if object is in the same group as the parcel //OSSL only may be used if object is in the same group as the parcel
if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER")) if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER"))
{ {
ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
if (land.LandData.GroupID == ti.GroupID && land.LandData.GroupID != UUID.Zero) if (land.LandData.GroupID == m_item.GroupID && land.LandData.GroupID != UUID.Zero)
{ {
return; return;
} }
@ -394,13 +386,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
if (!m_FunctionPerms[function].AllowedCreators.Contains(ti.CreatorID)) if (!m_FunctionPerms[function].AllowedCreators.Contains(m_item.CreatorID))
OSSLError( OSSLError(
String.Format("{0} permission denied. Script creator is not in the list of users allowed to execute this function and prim owner also has no permission.", String.Format("{0} permission denied. Script creator is not in the list of users allowed to execute this function and prim owner also has no permission.",
function)); function));
if (ti.CreatorID != ownerID)
if (m_item.CreatorID != ownerID)
{ {
if ((ti.CurrentPermissions & (uint)PermissionMask.Modify) != 0) if ((m_item.CurrentPermissions & (uint)PermissionMask.Modify) != 0)
OSSLError( OSSLError(
String.Format("{0} permission denied. Script permissions error.", String.Format("{0} permission denied. Script permissions error.",
function)); function));
@ -1183,7 +1176,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.High, "osSetStateEvents"); CheckThreatLevel(ThreatLevel.High, "osSetStateEvents");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.SetScriptEvents(m_itemID, events); m_host.SetScriptEvents(m_item.ItemID, events);
} }
public void osSetRegionWaterHeight(double height) public void osSetRegionWaterHeight(double height)

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -232,7 +232,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
foreach (string api in am.GetApis()) foreach (string api in am.GetApis())
{ {
m_Apis[api] = am.CreateApi(api); m_Apis[api] = am.CreateApi(api);
m_Apis[api].Initialize(engine, part, LocalID, itemID); m_Apis[api].Initialize(engine, part, LocalID, ScriptTask);
} }
try try

9
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
View File

@ -88,10 +88,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
// Create an object embedded inside the first // Create an object embedded inside the first
UUID itemId = TestHelpers.ParseTail(0x20); UUID itemId = TestHelpers.ParseTail(0x20);
TaskInventoryHelpers.AddSceneObject(m_scene, so1.RootPart, inventoryItemName, itemId, userId); TaskInventoryItem item
= TaskInventoryHelpers.AddSceneObject(m_scene, so1.RootPart, inventoryItemName, itemId, userId);
LSL_Api api = new LSL_Api(); LSL_Api api = new LSL_Api();
api.Initialize(m_engine, so1.RootPart, so1.RootPart.LocalId, so1.RootPart.UUID); api.Initialize(m_engine, so1.RootPart, so1.RootPart.LocalId, null);
// Create a second object // Create a second object
SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, userId, "so2", 0x100); SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, userId, "so2", 0x100);
@ -124,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10); SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
m_scene.AddSceneObject(so1); m_scene.AddSceneObject(so1);
LSL_Api api = new LSL_Api(); LSL_Api api = new LSL_Api();
api.Initialize(m_engine, so1.RootPart, so1.RootPart.LocalId, so1.RootPart.UUID); api.Initialize(m_engine, so1.RootPart, so1.RootPart.LocalId, null);
// Create an object embedded inside the first // Create an object embedded inside the first
UUID itemId = TestHelpers.ParseTail(0x20); UUID itemId = TestHelpers.ParseTail(0x20);
@ -134,7 +135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, user2Id, "so2", 0x100); SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, user2Id, "so2", 0x100);
m_scene.AddSceneObject(so2); m_scene.AddSceneObject(so2);
LSL_Api api2 = new LSL_Api(); LSL_Api api2 = new LSL_Api();
api2.Initialize(m_engine, so2.RootPart, so2.RootPart.LocalId, so2.RootPart.UUID); api2.Initialize(m_engine, so2.RootPart, so2.RootPart.LocalId, null);
// *** Firstly, we test where llAllowInventoryDrop() has not been called. *** // *** Firstly, we test where llAllowInventoryDrop() has not been called. ***
api.llGiveInventory(so2.UUID.ToString(), inventoryItemName); api.llGiveInventory(so2.UUID.ToString(), inventoryItemName);

3
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
View File

@ -66,8 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
engine.AddRegion(scene); engine.AddRegion(scene);
m_lslApi = new LSL_Api(); m_lslApi = new LSL_Api();
m_lslApi.Initialize(engine, part, part.LocalId, part.UUID); m_lslApi.Initialize(engine, part, part.LocalId, null);
} }
[Test] [Test]

8
OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
View File

@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so); m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api(); OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, part.LocalId, part.UUID); osslApi.Initialize(m_engine, part, part.LocalId, null);
string notecardName = "appearanceNc"; string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName); osslApi.osOwnerSaveAppearance(notecardName);
@ -130,7 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so); m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api(); OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, part.LocalId, part.UUID); osslApi.Initialize(m_engine, part, part.LocalId, null);
string notecardName = "appearanceNc"; string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName); osslApi.osOwnerSaveAppearance(notecardName);
@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so); m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api(); OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, part.LocalId, part.UUID); osslApi.Initialize(m_engine, part, part.LocalId, null);
string notecardName = "appearanceNc"; string notecardName = "appearanceNc";
@ -202,7 +202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so); m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api(); OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, part.LocalId, part.UUID); osslApi.Initialize(m_engine, part, part.LocalId, null);
string notecardName = "appearanceNc"; string notecardName = "appearanceNc";

6
OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
View File

@ -104,10 +104,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(otherSo); m_scene.AddSceneObject(otherSo);
OSSL_Api osslApi = new OSSL_Api(); OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, part.LocalId, part.UUID); osslApi.Initialize(m_engine, part, part.LocalId, null);
OSSL_Api otherOsslApi = new OSSL_Api(); OSSL_Api otherOsslApi = new OSSL_Api();
otherOsslApi.Initialize(m_engine, otherPart, otherPart.LocalId, otherPart.UUID); otherOsslApi.Initialize(m_engine, otherPart, otherPart.LocalId, null);
string notecardName = "appearanceNc"; string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName); osslApi.osOwnerSaveAppearance(notecardName);
@ -151,7 +151,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so); m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api(); OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, part.LocalId, part.UUID); osslApi.Initialize(m_engine, part, part.LocalId, null);
string notecardName = "appearanceNc"; string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName); osslApi.osOwnerSaveAppearance(notecardName);