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

Parameterize sleeps in LSL functions.

inv-download
Magnuz Binder 2015-03-22 13:40:30 +01:00 committed by Robert Adams
parent 07a75677c3
commit b51e46ceb8
1 changed files with 123 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected IUrlModule m_UrlModule = null; protected IUrlModule m_UrlModule = null;
protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>();
protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp.
protected int m_sleepMsOnSetTexture = 200;
protected int m_sleepMsOnSetLinkTexture = 200;
protected int m_sleepMsOnScaleTexture = 200;
protected int m_sleepMsOnOffsetTexture = 200;
protected int m_sleepMsOnRotateTexture = 200;
protected int m_sleepMsOnSetPos = 200;
protected int m_sleepMsOnSetRot = 200;
protected int m_sleepMsOnSetLocalRot = 200;
protected int m_sleepMsOnPreloadSound = 1000;
protected int m_sleepMsOnMakeExplosion = 100;
protected int m_sleepMsOnMakeFountain = 100;
protected int m_sleepMsOnMakeSmoke = 100;
protected int m_sleepMsOnMakeFire = 100;
protected int m_sleepMsOnRezAtRoot = 100;
protected int m_sleepMsOnInstantMessage = 2000;
protected int m_sleepMsOnEmail = 20000;
protected int m_sleepMsOnCreateLink = 1000;
protected int m_sleepMsOnGiveInventory = 3000;
protected int m_sleepMsOnRequestAgentData = 100;
protected int m_sleepMsOnRequestInventoryData = 1000;
protected int m_sleepMsOnSetDamage = 5000;
protected int m_sleepMsOnTextBox = 1000;
protected int m_sleepMsOnAdjustSoundVolume = 100;
protected int m_sleepMsOnEjectFromLand = 5000;
protected int m_sleepMsOnAddToLandPassList = 100;
protected int m_sleepMsOnDialog = 1000;
protected int m_sleepMsOnRemoteLoadScript = 3000;
protected int m_sleepMsOnRemoteLoadScriptPin = 3000;
protected int m_sleepMsOnOpenRemoteDataChannel = 1000;
protected int m_sleepMsOnSendRemoteData = 3000;
protected int m_sleepMsOnRemoteDataReply = 3000;
protected int m_sleepMsOnCloseRemoteDataChannel = 1000;
protected int m_sleepMsOnSetPrimitiveParams = 200;
protected int m_sleepMsOnSetLinkPrimitiveParams = 200;
protected int m_sleepMsOnXorBase64Strings = 300;
protected int m_sleepMsOnSetParcelMusicURL = 2000;
protected int m_sleepMsOnGetPrimMediaParams = 1000;
protected int m_sleepMsOnGetLinkMedia = 1000;
protected int m_sleepMsOnSetPrimMediaParams = 1000;
protected int m_sleepMsOnSetLinkMedia = 1000;
protected int m_sleepMsOnClearPrimMedia = 1000;
protected int m_sleepMsOnClearLinkMedia = 1000;
protected int m_sleepMsOnRequestSimulatorData = 1000;
protected int m_sleepMsOnLoadURL = 10000;
protected int m_sleepMsOnParcelMediaCommandList = 2000;
protected int m_sleepMsOnParcelMediaQuery = 2000;
protected int m_sleepMsOnModPow = 1000;
protected int m_sleepMsOnSetPrimURL = 2000;
protected int m_sleepMsOnRefreshPrimURL = 20000;
protected int m_sleepMsOnMapDestination = 1000;
protected int m_sleepMsOnAddToLandBanList = 100;
protected int m_sleepMsOnRemoveFromLandPassList = 100;
protected int m_sleepMsOnRemoveFromLandBanList = 100;
protected int m_sleepMsOnResetLandBanList = 100;
protected int m_sleepMsOnResetLandPassList = 100;
protected int m_sleepMsOnGetParcelPrimOwners = 2000;
protected int m_sleepMsOnGetNumberOfNotecardLines = 100;
protected int m_sleepMsOnGetNotecardLine = 100;
protected string m_internalObjectHost = "lsl.opensim.local"; protected string m_internalObjectHost = "lsl.opensim.local";
protected bool m_restrictEmail = false; protected bool m_restrictEmail = false;
protected ISoundModule m_SoundModule = null; protected ISoundModule m_SoundModule = null;
@ -210,6 +268,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost); m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost);
} }
} }
m_sleepMsOnEmail = EMAIL_PAUSE_TIME * 1000;
} }
public override Object InitializeLifetimeService() public override Object InitializeLifetimeService()
@ -1958,7 +2017,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
SetTexture(m_host, texture, face); SetTexture(m_host, texture, face);
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetTexture);
} }
public void llSetLinkTexture(int linknumber, string texture, int face) public void llSetLinkTexture(int linknumber, string texture, int face)
@ -1970,7 +2029,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
SetTexture(part, texture, face); SetTexture(part, texture, face);
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetLinkTexture);
} }
protected void SetTexture(SceneObjectPart part, string texture, int face) protected void SetTexture(SceneObjectPart part, string texture, int face)
@ -2014,7 +2073,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScaleTexture(m_host, u, v, face); ScaleTexture(m_host, u, v, face);
ScriptSleep(200); ScriptSleep(m_sleepMsOnScaleTexture);
} }
protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
@ -2050,7 +2109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
OffsetTexture(m_host, u, v, face); OffsetTexture(m_host, u, v, face);
ScriptSleep(200); ScriptSleep(m_sleepMsOnOffsetTexture);
} }
protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
@ -2086,7 +2145,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
RotateTexture(m_host, rotation, face); RotateTexture(m_host, rotation, face);
ScriptSleep(200); ScriptSleep(m_sleepMsOnRotateTexture);
} }
protected void RotateTexture(SceneObjectPart part, double rotation, int face) protected void RotateTexture(SceneObjectPart part, double rotation, int face)
@ -2161,7 +2220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
SetPos(m_host, pos, true); SetPos(m_host, pos, true);
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetPos);
} }
/// <summary> /// <summary>
@ -2344,14 +2403,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetRot);
} }
public void llSetLocalRot(LSL_Rotation rot) public void llSetLocalRot(LSL_Rotation rot)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
SetRot(m_host, rot); SetRot(m_host, rot);
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetLocalRot);
} }
protected void SetRot(SceneObjectPart part, Quaternion rot) protected void SetRot(SceneObjectPart part, Quaternion rot)
@ -2713,7 +2772,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if (m_SoundModule != null) if (m_SoundModule != null)
m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0); m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnPreloadSound);
} }
/// <summary> /// <summary>
@ -2986,28 +3045,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llMakeExplosion", "Use llParticleSystem instead"); Deprecated("llMakeExplosion", "Use llParticleSystem instead");
ScriptSleep(100); ScriptSleep(m_sleepMsOnMakeExplosion);
} }
public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llMakeFountain", "Use llParticleSystem instead"); Deprecated("llMakeFountain", "Use llParticleSystem instead");
ScriptSleep(100); ScriptSleep(m_sleepMsOnMakeFountain);
} }
public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llMakeSmoke", "Use llParticleSystem instead"); Deprecated("llMakeSmoke", "Use llParticleSystem instead");
ScriptSleep(100); ScriptSleep(m_sleepMsOnMakeSmoke);
} }
public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llMakeFire", "Use llParticleSystem instead"); Deprecated("llMakeFire", "Use llParticleSystem instead");
ScriptSleep(100); ScriptSleep(m_sleepMsOnMakeFire);
} }
public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
@ -3078,7 +3137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}, null, "LSL_Api.llRezAtRoot"); }, null, "LSL_Api.llRezAtRoot");
//ScriptSleep((int)((groupmass * velmag) / 10)); //ScriptSleep((int)((groupmass * velmag) / 10));
ScriptSleep(100); ScriptSleep(m_sleepMsOnRezAtRoot);
} }
public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
@ -3385,7 +3444,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
} }
ScriptSleep(2000); ScriptSleep(m_sleepMsOnInstantMessage);
} }
public void llEmail(string address, string subject, string message) public void llEmail(string address, string subject, string message)
@ -3423,7 +3482,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
emailModule.SendEmail(m_host.UUID, address, subject, message); emailModule.SendEmail(m_host.UUID, address, subject, message);
ScriptSleep(EMAIL_PAUSE_TIME * 1000); ScriptSleep(m_sleepMsOnEmail);
} }
public void llGetNextEmail(string address, string subject) public void llGetNextEmail(string address, string subject)
@ -3882,7 +3941,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (client != null) if (client != null)
parentPrim.SendPropertiesToClient(client); parentPrim.SendPropertiesToClient(client);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnCreateLink);
} }
public void llBreakLink(int linknum) public void llBreakLink(int linknum)
@ -4198,7 +4257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
} }
ScriptSleep(3000); ScriptSleep(m_sleepMsOnGiveInventory);
} }
} }
@ -4368,7 +4427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AsyncCommands. AsyncCommands.
DataserverPlugin.DataserverReply(rq.ToString(), reply); DataserverPlugin.DataserverReply(rq.ToString(), reply);
ScriptSleep(100); ScriptSleep(m_sleepMsOnRequestAgentData);
return tid.ToString(); return tid.ToString();
} }
@ -4401,12 +4460,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
reply); reply);
}); });
ScriptSleep(1000); ScriptSleep(m_sleepMsOnRequestInventoryData);
return tid.ToString(); return tid.ToString();
} }
} }
ScriptSleep(1000); ScriptSleep(m_sleepMsOnRequestInventoryData);
return String.Empty; return String.Empty;
} }
@ -4433,7 +4492,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
ScriptSleep(5000); ScriptSleep(m_sleepMsOnSetDamage);
} }
public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt) public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt)
@ -4549,7 +4608,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else else
{ {
dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID); dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnTextBox);
} }
} }
@ -6035,7 +6094,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.AdjustSoundGain(volume); m_host.AdjustSoundGain(volume);
ScriptSleep(100); ScriptSleep(m_sleepMsOnAdjustSoundVolume);
} }
public void llSetSoundRadius(double radius) public void llSetSoundRadius(double radius)
@ -6141,7 +6200,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
} }
ScriptSleep(5000); ScriptSleep(m_sleepMsOnEjectFromLand);
} }
public LSL_Integer llOverMyLand(string id) public LSL_Integer llOverMyLand(string id)
@ -7116,7 +7175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
} }
} }
ScriptSleep(100); ScriptSleep(m_sleepMsOnAddToLandPassList);
} }
public void llSetTouchText(string text) public void llSetTouchText(string text)
@ -7254,7 +7313,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
av, m_host.Name, m_host.UUID, m_host.OwnerID, av, m_host.Name, m_host.UUID, m_host.OwnerID,
message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnDialog);
} }
public void llVolumeDetect(int detect) public void llVolumeDetect(int detect)
@ -7269,7 +7328,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead"); Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead");
ScriptSleep(3000); ScriptSleep(m_sleepMsOnRemoteLoadScript);
} }
public void llSetRemoteScriptAccessPin(int pin) public void llSetRemoteScriptAccessPin(int pin)
@ -7310,7 +7369,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param);
// this will cause the delay even if the script pin or permissions were wrong - seems ok // this will cause the delay even if the script pin or permissions were wrong - seems ok
ScriptSleep(3000); ScriptSleep(m_sleepMsOnRemoteLoadScriptPin);
} }
public void llOpenRemoteDataChannel() public void llOpenRemoteDataChannel()
@ -7341,14 +7400,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_ScriptEngine.PostScriptEvent(m_item.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(m_sleepMsOnOpenRemoteDataChannel);
} }
public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata) public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata)
{ {
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(m_sleepMsOnSendRemoteData);
if (xmlrpcMod == null) if (xmlrpcMod == null)
return ""; return "";
return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString(); return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString();
@ -7360,7 +7419,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
if (xmlrpcMod != null) if (xmlrpcMod != null)
xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata); xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata);
ScriptSleep(3000); ScriptSleep(m_sleepMsOnRemoteDataReply);
} }
public void llCloseRemoteDataChannel(string channel) public void llCloseRemoteDataChannel(string channel)
@ -7376,7 +7435,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
if (xmlrpcMod != null) if (xmlrpcMod != null)
xmlrpcMod.CloseXMLRPCChannel((UUID)channel); xmlrpcMod.CloseXMLRPCChannel((UUID)channel);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnCloseRemoteDataChannel);
} }
public LSL_String llMD5String(string src, int nonce) public LSL_String llMD5String(string src, int nonce)
@ -7769,7 +7828,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams"); SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams");
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetPrimitiveParams);
} }
public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
@ -7778,7 +7837,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams"); SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
ScriptSleep(200); ScriptSleep(m_sleepMsOnSetLinkPrimitiveParams);
} }
public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
@ -9391,7 +9450,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llXorBase64Strings", "Use llXorBase64 instead"); Deprecated("llXorBase64Strings", "Use llXorBase64 instead");
ScriptSleep(300); ScriptSleep(m_sleepMsOnXorBase64Strings);
return String.Empty; return String.Empty;
} }
@ -9439,7 +9498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
land.SetMusicUrl(url); land.SetMusicUrl(url);
ScriptSleep(2000); ScriptSleep(m_sleepMsOnSetParcelMusicURL);
} }
public LSL_String llGetParcelMusicURL() public LSL_String llGetParcelMusicURL()
@ -10218,14 +10277,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_List llGetPrimMediaParams(int face, LSL_List rules) public LSL_List llGetPrimMediaParams(int face, LSL_List rules)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnGetPrimMediaParams);
return GetPrimMediaParams(m_host, face, rules); return GetPrimMediaParams(m_host, face, rules);
} }
public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnGetLinkMedia);
if (link == ScriptBaseClass.LINK_ROOT) if (link == ScriptBaseClass.LINK_ROOT)
return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules);
else if (link == ScriptBaseClass.LINK_THIS) else if (link == ScriptBaseClass.LINK_THIS)
@ -10345,14 +10404,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules) public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnSetPrimMediaParams);
return SetPrimMediaParams(m_host, face, rules); return SetPrimMediaParams(m_host, face, rules);
} }
public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnSetLinkMedia);
if (link == ScriptBaseClass.LINK_ROOT) if (link == ScriptBaseClass.LINK_ROOT)
return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules);
else if (link == ScriptBaseClass.LINK_THIS) else if (link == ScriptBaseClass.LINK_THIS)
@ -10471,14 +10530,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llClearPrimMedia(LSL_Integer face) public LSL_Integer llClearPrimMedia(LSL_Integer face)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnClearPrimMedia);
return ClearPrimMedia(m_host, face); return ClearPrimMedia(m_host, face);
} }
public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face) public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnClearLinkMedia);
if (link == ScriptBaseClass.LINK_ROOT) if (link == ScriptBaseClass.LINK_ROOT)
return ClearPrimMedia(m_host.ParentGroup.RootPart, face); return ClearPrimMedia(m_host.ParentGroup.RootPart, face);
else if (link == ScriptBaseClass.LINK_THIS) else if (link == ScriptBaseClass.LINK_THIS)
@ -11165,7 +11224,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.DATA_SIM_POS: case ScriptBaseClass.DATA_SIM_POS:
if (info == null) if (info == null)
{ {
ScriptSleep(1000); ScriptSleep(m_sleepMsOnRequestSimulatorData);
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
@ -11212,7 +11271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.DATA_SIM_RATING: case ScriptBaseClass.DATA_SIM_RATING:
if (info == null) if (info == null)
{ {
ScriptSleep(1000); ScriptSleep(m_sleepMsOnRequestSimulatorData);
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
int access = info.Maturity; int access = info.Maturity;
@ -11231,7 +11290,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
reply = "OpenSim"; reply = "OpenSim";
break; break;
default: default:
ScriptSleep(1000); ScriptSleep(m_sleepMsOnRequestSimulatorData);
return UUID.Zero.ToString(); // Raise no event return UUID.Zero.ToString(); // Raise no event
} }
UUID rq = UUID.Random(); UUID rq = UUID.Random();
@ -11242,7 +11301,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AsyncCommands. AsyncCommands.
DataserverPlugin.DataserverReply(rq.ToString(), reply); DataserverPlugin.DataserverReply(rq.ToString(), reply);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnRequestSimulatorData);
return tid.ToString(); return tid.ToString();
} }
catch(Exception) catch(Exception)
@ -11387,7 +11446,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
dm.SendUrlToUser( dm.SendUrlToUser(
new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url); new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url);
ScriptSleep(10000); ScriptSleep(m_sleepMsOnLoadURL);
} }
public void llParcelMediaCommandList(LSL_List commandList) public void llParcelMediaCommandList(LSL_List commandList)
@ -11630,7 +11689,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
time); time);
} }
} }
ScriptSleep(2000); ScriptSleep(m_sleepMsOnParcelMediaCommandList);
} }
public LSL_List llParcelMediaQuery(LSL_List aList) public LSL_List llParcelMediaQuery(LSL_List aList)
@ -11670,7 +11729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
ScriptSleep(2000); ScriptSleep(m_sleepMsOnParcelMediaQuery);
return list; return list;
} }
@ -11679,7 +11738,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Int64 tmp = 0; Int64 tmp = 0;
Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp); Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp);
ScriptSleep(1000); ScriptSleep(m_sleepMsOnModPow);
return Convert.ToInt32(tmp); return Convert.ToInt32(tmp);
} }
@ -11762,14 +11821,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead"); Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead");
ScriptSleep(2000); ScriptSleep(m_sleepMsOnSetPrimURL);
} }
public void llRefreshPrimURL() public void llRefreshPrimURL()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
Deprecated("llRefreshPrimURL"); Deprecated("llRefreshPrimURL");
ScriptSleep(20000); ScriptSleep(m_sleepMsOnRefreshPrimURL);
} }
public LSL_String llEscapeURL(string url) public LSL_String llEscapeURL(string url)
@ -11810,7 +11869,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
simname, pos, lookAt); simname, pos, lookAt);
} }
ScriptSleep(1000); ScriptSleep(m_sleepMsOnMapDestination);
} }
public void llAddToLandBanList(string avatar, double hours) public void llAddToLandBanList(string avatar, double hours)
@ -11851,7 +11910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
} }
} }
ScriptSleep(100); ScriptSleep(m_sleepMsOnAddToLandBanList);
} }
public void llRemoveFromLandPassList(string avatar) public void llRemoveFromLandPassList(string avatar)
@ -11878,7 +11937,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
} }
ScriptSleep(100); ScriptSleep(m_sleepMsOnRemoveFromLandPassList);
} }
public void llRemoveFromLandBanList(string avatar) public void llRemoveFromLandBanList(string avatar)
@ -11905,7 +11964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
} }
ScriptSleep(100); ScriptSleep(m_sleepMsOnRemoveFromLandBanList);
} }
public void llSetCameraParams(LSL_List rules) public void llSetCameraParams(LSL_List rules)
@ -12288,7 +12347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
} }
ScriptSleep(100); ScriptSleep(m_sleepMsOnResetLandBanList);
} }
public void llResetLandPassList() public void llResetLandPassList()
@ -12305,7 +12364,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
} }
ScriptSleep(100); ScriptSleep(m_sleepMsOnResetLandPassList);
} }
public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide)
@ -12363,7 +12422,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ret.Add(new LSL_Integer(detectedParams.Value)); ret.Add(new LSL_Integer(detectedParams.Value));
} }
} }
ScriptSleep(2000); ScriptSleep(m_sleepMsOnGetParcelPrimOwners);
return ret; return ret;
} }
@ -12836,7 +12895,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString()); AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString());
ScriptSleep(100); ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines);
return tid.ToString(); return tid.ToString();
} }
@ -12852,7 +12911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString()); AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString());
}); });
ScriptSleep(100); ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines);
return tid.ToString(); return tid.ToString();
} }
@ -12888,7 +12947,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AsyncCommands.DataserverPlugin.DataserverReply( AsyncCommands.DataserverPlugin.DataserverReply(
reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
ScriptSleep(100); ScriptSleep(m_sleepMsOnGetNotecardLine);
return tid.ToString(); return tid.ToString();
} }
@ -12907,7 +12966,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
}); });
ScriptSleep(100); ScriptSleep(m_sleepMsOnGetNotecardLine);
return tid.ToString(); return tid.ToString();
} }