diff options
author | Magnuz Binder | 2015-03-22 13:40:30 +0100 |
---|---|---|
committer | Robert Adams | 2015-03-22 09:55:02 -0700 |
commit | b51e46ceb88cdc376c6aa1aad9c3595603dca0e1 (patch) | |
tree | 6bc33c4a1e862169c13f095fb29e70faf14d1916 /OpenSim/Region | |
parent | Allow setting hollow to 99% from scripts just like from viewer. (diff) | |
download | opensim-SC-b51e46ceb88cdc376c6aa1aad9c3595603dca0e1.zip opensim-SC-b51e46ceb88cdc376c6aa1aad9c3595603dca0e1.tar.gz opensim-SC-b51e46ceb88cdc376c6aa1aad9c3595603dca0e1.tar.bz2 opensim-SC-b51e46ceb88cdc376c6aa1aad9c3595603dca0e1.tar.xz |
Parameterize sleeps in LSL functions.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 187 |
1 files changed, 123 insertions, 64 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f075d50..d2ed1f7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -120,6 +120,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
120 | protected IUrlModule m_UrlModule = null; | 120 | protected IUrlModule m_UrlModule = null; |
121 | protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); | 121 | protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); |
122 | protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. | 122 | protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. |
123 | protected int m_sleepMsOnSetTexture = 200; | ||
124 | protected int m_sleepMsOnSetLinkTexture = 200; | ||
125 | protected int m_sleepMsOnScaleTexture = 200; | ||
126 | protected int m_sleepMsOnOffsetTexture = 200; | ||
127 | protected int m_sleepMsOnRotateTexture = 200; | ||
128 | protected int m_sleepMsOnSetPos = 200; | ||
129 | protected int m_sleepMsOnSetRot = 200; | ||
130 | protected int m_sleepMsOnSetLocalRot = 200; | ||
131 | protected int m_sleepMsOnPreloadSound = 1000; | ||
132 | protected int m_sleepMsOnMakeExplosion = 100; | ||
133 | protected int m_sleepMsOnMakeFountain = 100; | ||
134 | protected int m_sleepMsOnMakeSmoke = 100; | ||
135 | protected int m_sleepMsOnMakeFire = 100; | ||
136 | protected int m_sleepMsOnRezAtRoot = 100; | ||
137 | protected int m_sleepMsOnInstantMessage = 2000; | ||
138 | protected int m_sleepMsOnEmail = 20000; | ||
139 | protected int m_sleepMsOnCreateLink = 1000; | ||
140 | protected int m_sleepMsOnGiveInventory = 3000; | ||
141 | protected int m_sleepMsOnRequestAgentData = 100; | ||
142 | protected int m_sleepMsOnRequestInventoryData = 1000; | ||
143 | protected int m_sleepMsOnSetDamage = 5000; | ||
144 | protected int m_sleepMsOnTextBox = 1000; | ||
145 | protected int m_sleepMsOnAdjustSoundVolume = 100; | ||
146 | protected int m_sleepMsOnEjectFromLand = 5000; | ||
147 | protected int m_sleepMsOnAddToLandPassList = 100; | ||
148 | protected int m_sleepMsOnDialog = 1000; | ||
149 | protected int m_sleepMsOnRemoteLoadScript = 3000; | ||
150 | protected int m_sleepMsOnRemoteLoadScriptPin = 3000; | ||
151 | protected int m_sleepMsOnOpenRemoteDataChannel = 1000; | ||
152 | protected int m_sleepMsOnSendRemoteData = 3000; | ||
153 | protected int m_sleepMsOnRemoteDataReply = 3000; | ||
154 | protected int m_sleepMsOnCloseRemoteDataChannel = 1000; | ||
155 | protected int m_sleepMsOnSetPrimitiveParams = 200; | ||
156 | protected int m_sleepMsOnSetLinkPrimitiveParams = 200; | ||
157 | protected int m_sleepMsOnXorBase64Strings = 300; | ||
158 | protected int m_sleepMsOnSetParcelMusicURL = 2000; | ||
159 | protected int m_sleepMsOnGetPrimMediaParams = 1000; | ||
160 | protected int m_sleepMsOnGetLinkMedia = 1000; | ||
161 | protected int m_sleepMsOnSetPrimMediaParams = 1000; | ||
162 | protected int m_sleepMsOnSetLinkMedia = 1000; | ||
163 | protected int m_sleepMsOnClearPrimMedia = 1000; | ||
164 | protected int m_sleepMsOnClearLinkMedia = 1000; | ||
165 | protected int m_sleepMsOnRequestSimulatorData = 1000; | ||
166 | protected int m_sleepMsOnLoadURL = 10000; | ||
167 | protected int m_sleepMsOnParcelMediaCommandList = 2000; | ||
168 | protected int m_sleepMsOnParcelMediaQuery = 2000; | ||
169 | protected int m_sleepMsOnModPow = 1000; | ||
170 | protected int m_sleepMsOnSetPrimURL = 2000; | ||
171 | protected int m_sleepMsOnRefreshPrimURL = 20000; | ||
172 | protected int m_sleepMsOnMapDestination = 1000; | ||
173 | protected int m_sleepMsOnAddToLandBanList = 100; | ||
174 | protected int m_sleepMsOnRemoveFromLandPassList = 100; | ||
175 | protected int m_sleepMsOnRemoveFromLandBanList = 100; | ||
176 | protected int m_sleepMsOnResetLandBanList = 100; | ||
177 | protected int m_sleepMsOnResetLandPassList = 100; | ||
178 | protected int m_sleepMsOnGetParcelPrimOwners = 2000; | ||
179 | protected int m_sleepMsOnGetNumberOfNotecardLines = 100; | ||
180 | protected int m_sleepMsOnGetNotecardLine = 100; | ||
123 | protected string m_internalObjectHost = "lsl.opensim.local"; | 181 | protected string m_internalObjectHost = "lsl.opensim.local"; |
124 | protected bool m_restrictEmail = false; | 182 | protected bool m_restrictEmail = false; |
125 | protected ISoundModule m_SoundModule = null; | 183 | protected ISoundModule m_SoundModule = null; |
@@ -210,6 +268,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
210 | m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost); | 268 | m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost); |
211 | } | 269 | } |
212 | } | 270 | } |
271 | m_sleepMsOnEmail = EMAIL_PAUSE_TIME * 1000; | ||
213 | } | 272 | } |
214 | 273 | ||
215 | public override Object InitializeLifetimeService() | 274 | public override Object InitializeLifetimeService() |
@@ -1958,7 +2017,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1958 | { | 2017 | { |
1959 | m_host.AddScriptLPS(1); | 2018 | m_host.AddScriptLPS(1); |
1960 | SetTexture(m_host, texture, face); | 2019 | SetTexture(m_host, texture, face); |
1961 | ScriptSleep(200); | 2020 | ScriptSleep(m_sleepMsOnSetTexture); |
1962 | } | 2021 | } |
1963 | 2022 | ||
1964 | public void llSetLinkTexture(int linknumber, string texture, int face) | 2023 | public void llSetLinkTexture(int linknumber, string texture, int face) |
@@ -1970,7 +2029,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1970 | foreach (SceneObjectPart part in parts) | 2029 | foreach (SceneObjectPart part in parts) |
1971 | SetTexture(part, texture, face); | 2030 | SetTexture(part, texture, face); |
1972 | 2031 | ||
1973 | ScriptSleep(200); | 2032 | ScriptSleep(m_sleepMsOnSetLinkTexture); |
1974 | } | 2033 | } |
1975 | 2034 | ||
1976 | protected void SetTexture(SceneObjectPart part, string texture, int face) | 2035 | protected void SetTexture(SceneObjectPart part, string texture, int face) |
@@ -2014,7 +2073,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2014 | m_host.AddScriptLPS(1); | 2073 | m_host.AddScriptLPS(1); |
2015 | 2074 | ||
2016 | ScaleTexture(m_host, u, v, face); | 2075 | ScaleTexture(m_host, u, v, face); |
2017 | ScriptSleep(200); | 2076 | ScriptSleep(m_sleepMsOnScaleTexture); |
2018 | } | 2077 | } |
2019 | 2078 | ||
2020 | protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) | 2079 | protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) |
@@ -2050,7 +2109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2050 | { | 2109 | { |
2051 | m_host.AddScriptLPS(1); | 2110 | m_host.AddScriptLPS(1); |
2052 | OffsetTexture(m_host, u, v, face); | 2111 | OffsetTexture(m_host, u, v, face); |
2053 | ScriptSleep(200); | 2112 | ScriptSleep(m_sleepMsOnOffsetTexture); |
2054 | } | 2113 | } |
2055 | 2114 | ||
2056 | protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) | 2115 | protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) |
@@ -2086,7 +2145,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2086 | { | 2145 | { |
2087 | m_host.AddScriptLPS(1); | 2146 | m_host.AddScriptLPS(1); |
2088 | RotateTexture(m_host, rotation, face); | 2147 | RotateTexture(m_host, rotation, face); |
2089 | ScriptSleep(200); | 2148 | ScriptSleep(m_sleepMsOnRotateTexture); |
2090 | } | 2149 | } |
2091 | 2150 | ||
2092 | protected void RotateTexture(SceneObjectPart part, double rotation, int face) | 2151 | protected void RotateTexture(SceneObjectPart part, double rotation, int face) |
@@ -2161,7 +2220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2161 | 2220 | ||
2162 | SetPos(m_host, pos, true); | 2221 | SetPos(m_host, pos, true); |
2163 | 2222 | ||
2164 | ScriptSleep(200); | 2223 | ScriptSleep(m_sleepMsOnSetPos); |
2165 | } | 2224 | } |
2166 | 2225 | ||
2167 | /// <summary> | 2226 | /// <summary> |
@@ -2344,14 +2403,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2344 | } | 2403 | } |
2345 | } | 2404 | } |
2346 | 2405 | ||
2347 | ScriptSleep(200); | 2406 | ScriptSleep(m_sleepMsOnSetRot); |
2348 | } | 2407 | } |
2349 | 2408 | ||
2350 | public void llSetLocalRot(LSL_Rotation rot) | 2409 | public void llSetLocalRot(LSL_Rotation rot) |
2351 | { | 2410 | { |
2352 | m_host.AddScriptLPS(1); | 2411 | m_host.AddScriptLPS(1); |
2353 | SetRot(m_host, rot); | 2412 | SetRot(m_host, rot); |
2354 | ScriptSleep(200); | 2413 | ScriptSleep(m_sleepMsOnSetLocalRot); |
2355 | } | 2414 | } |
2356 | 2415 | ||
2357 | protected void SetRot(SceneObjectPart part, Quaternion rot) | 2416 | protected void SetRot(SceneObjectPart part, Quaternion rot) |
@@ -2713,7 +2772,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2713 | m_host.AddScriptLPS(1); | 2772 | m_host.AddScriptLPS(1); |
2714 | if (m_SoundModule != null) | 2773 | if (m_SoundModule != null) |
2715 | m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0); | 2774 | m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0); |
2716 | ScriptSleep(1000); | 2775 | ScriptSleep(m_sleepMsOnPreloadSound); |
2717 | } | 2776 | } |
2718 | 2777 | ||
2719 | /// <summary> | 2778 | /// <summary> |
@@ -2986,28 +3045,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2986 | { | 3045 | { |
2987 | m_host.AddScriptLPS(1); | 3046 | m_host.AddScriptLPS(1); |
2988 | Deprecated("llMakeExplosion", "Use llParticleSystem instead"); | 3047 | Deprecated("llMakeExplosion", "Use llParticleSystem instead"); |
2989 | ScriptSleep(100); | 3048 | ScriptSleep(m_sleepMsOnMakeExplosion); |
2990 | } | 3049 | } |
2991 | 3050 | ||
2992 | public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) | 3051 | public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) |
2993 | { | 3052 | { |
2994 | m_host.AddScriptLPS(1); | 3053 | m_host.AddScriptLPS(1); |
2995 | Deprecated("llMakeFountain", "Use llParticleSystem instead"); | 3054 | Deprecated("llMakeFountain", "Use llParticleSystem instead"); |
2996 | ScriptSleep(100); | 3055 | ScriptSleep(m_sleepMsOnMakeFountain); |
2997 | } | 3056 | } |
2998 | 3057 | ||
2999 | public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) | 3058 | public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
3000 | { | 3059 | { |
3001 | m_host.AddScriptLPS(1); | 3060 | m_host.AddScriptLPS(1); |
3002 | Deprecated("llMakeSmoke", "Use llParticleSystem instead"); | 3061 | Deprecated("llMakeSmoke", "Use llParticleSystem instead"); |
3003 | ScriptSleep(100); | 3062 | ScriptSleep(m_sleepMsOnMakeSmoke); |
3004 | } | 3063 | } |
3005 | 3064 | ||
3006 | public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) | 3065 | public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
3007 | { | 3066 | { |
3008 | m_host.AddScriptLPS(1); | 3067 | m_host.AddScriptLPS(1); |
3009 | Deprecated("llMakeFire", "Use llParticleSystem instead"); | 3068 | Deprecated("llMakeFire", "Use llParticleSystem instead"); |
3010 | ScriptSleep(100); | 3069 | ScriptSleep(m_sleepMsOnMakeFire); |
3011 | } | 3070 | } |
3012 | 3071 | ||
3013 | public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) | 3072 | 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 | |||
3078 | }, null, "LSL_Api.llRezAtRoot"); | 3137 | }, null, "LSL_Api.llRezAtRoot"); |
3079 | 3138 | ||
3080 | //ScriptSleep((int)((groupmass * velmag) / 10)); | 3139 | //ScriptSleep((int)((groupmass * velmag) / 10)); |
3081 | ScriptSleep(100); | 3140 | ScriptSleep(m_sleepMsOnRezAtRoot); |
3082 | } | 3141 | } |
3083 | 3142 | ||
3084 | public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) | 3143 | 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 | |||
3385 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 3444 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
3386 | } | 3445 | } |
3387 | 3446 | ||
3388 | ScriptSleep(2000); | 3447 | ScriptSleep(m_sleepMsOnInstantMessage); |
3389 | } | 3448 | } |
3390 | 3449 | ||
3391 | public void llEmail(string address, string subject, string message) | 3450 | public void llEmail(string address, string subject, string message) |
@@ -3423,7 +3482,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3423 | } | 3482 | } |
3424 | 3483 | ||
3425 | emailModule.SendEmail(m_host.UUID, address, subject, message); | 3484 | emailModule.SendEmail(m_host.UUID, address, subject, message); |
3426 | ScriptSleep(EMAIL_PAUSE_TIME * 1000); | 3485 | ScriptSleep(m_sleepMsOnEmail); |
3427 | } | 3486 | } |
3428 | 3487 | ||
3429 | public void llGetNextEmail(string address, string subject) | 3488 | public void llGetNextEmail(string address, string subject) |
@@ -3882,7 +3941,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3882 | if (client != null) | 3941 | if (client != null) |
3883 | parentPrim.SendPropertiesToClient(client); | 3942 | parentPrim.SendPropertiesToClient(client); |
3884 | 3943 | ||
3885 | ScriptSleep(1000); | 3944 | ScriptSleep(m_sleepMsOnCreateLink); |
3886 | } | 3945 | } |
3887 | 3946 | ||
3888 | public void llBreakLink(int linknum) | 3947 | public void llBreakLink(int linknum) |
@@ -4198,7 +4257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4198 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 4257 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
4199 | } | 4258 | } |
4200 | 4259 | ||
4201 | ScriptSleep(3000); | 4260 | ScriptSleep(m_sleepMsOnGiveInventory); |
4202 | } | 4261 | } |
4203 | } | 4262 | } |
4204 | 4263 | ||
@@ -4368,7 +4427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4368 | AsyncCommands. | 4427 | AsyncCommands. |
4369 | DataserverPlugin.DataserverReply(rq.ToString(), reply); | 4428 | DataserverPlugin.DataserverReply(rq.ToString(), reply); |
4370 | 4429 | ||
4371 | ScriptSleep(100); | 4430 | ScriptSleep(m_sleepMsOnRequestAgentData); |
4372 | return tid.ToString(); | 4431 | return tid.ToString(); |
4373 | } | 4432 | } |
4374 | 4433 | ||
@@ -4401,12 +4460,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4401 | reply); | 4460 | reply); |
4402 | }); | 4461 | }); |
4403 | 4462 | ||
4404 | ScriptSleep(1000); | 4463 | ScriptSleep(m_sleepMsOnRequestInventoryData); |
4405 | return tid.ToString(); | 4464 | return tid.ToString(); |
4406 | } | 4465 | } |
4407 | } | 4466 | } |
4408 | 4467 | ||
4409 | ScriptSleep(1000); | 4468 | ScriptSleep(m_sleepMsOnRequestInventoryData); |
4410 | return String.Empty; | 4469 | return String.Empty; |
4411 | } | 4470 | } |
4412 | 4471 | ||
@@ -4433,7 +4492,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4433 | } | 4492 | } |
4434 | } | 4493 | } |
4435 | 4494 | ||
4436 | ScriptSleep(5000); | 4495 | ScriptSleep(m_sleepMsOnSetDamage); |
4437 | } | 4496 | } |
4438 | 4497 | ||
4439 | public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt) | 4498 | public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt) |
@@ -4549,7 +4608,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4549 | else | 4608 | else |
4550 | { | 4609 | { |
4551 | dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID); | 4610 | dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID); |
4552 | ScriptSleep(1000); | 4611 | ScriptSleep(m_sleepMsOnTextBox); |
4553 | } | 4612 | } |
4554 | } | 4613 | } |
4555 | 4614 | ||
@@ -6035,7 +6094,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6035 | { | 6094 | { |
6036 | m_host.AddScriptLPS(1); | 6095 | m_host.AddScriptLPS(1); |
6037 | m_host.AdjustSoundGain(volume); | 6096 | m_host.AdjustSoundGain(volume); |
6038 | ScriptSleep(100); | 6097 | ScriptSleep(m_sleepMsOnAdjustSoundVolume); |
6039 | } | 6098 | } |
6040 | 6099 | ||
6041 | public void llSetSoundRadius(double radius) | 6100 | public void llSetSoundRadius(double radius) |
@@ -6141,7 +6200,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6141 | } | 6200 | } |
6142 | } | 6201 | } |
6143 | } | 6202 | } |
6144 | ScriptSleep(5000); | 6203 | ScriptSleep(m_sleepMsOnEjectFromLand); |
6145 | } | 6204 | } |
6146 | 6205 | ||
6147 | public LSL_Integer llOverMyLand(string id) | 6206 | public LSL_Integer llOverMyLand(string id) |
@@ -7116,7 +7175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7116 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); | 7175 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); |
7117 | } | 7176 | } |
7118 | } | 7177 | } |
7119 | ScriptSleep(100); | 7178 | ScriptSleep(m_sleepMsOnAddToLandPassList); |
7120 | } | 7179 | } |
7121 | 7180 | ||
7122 | public void llSetTouchText(string text) | 7181 | public void llSetTouchText(string text) |
@@ -7254,7 +7313,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7254 | av, m_host.Name, m_host.UUID, m_host.OwnerID, | 7313 | av, m_host.Name, m_host.UUID, m_host.OwnerID, |
7255 | message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); | 7314 | message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); |
7256 | 7315 | ||
7257 | ScriptSleep(1000); | 7316 | ScriptSleep(m_sleepMsOnDialog); |
7258 | } | 7317 | } |
7259 | 7318 | ||
7260 | public void llVolumeDetect(int detect) | 7319 | public void llVolumeDetect(int detect) |
@@ -7269,7 +7328,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7269 | { | 7328 | { |
7270 | m_host.AddScriptLPS(1); | 7329 | m_host.AddScriptLPS(1); |
7271 | Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead"); | 7330 | Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead"); |
7272 | ScriptSleep(3000); | 7331 | ScriptSleep(m_sleepMsOnRemoteLoadScript); |
7273 | } | 7332 | } |
7274 | 7333 | ||
7275 | public void llSetRemoteScriptAccessPin(int pin) | 7334 | public void llSetRemoteScriptAccessPin(int pin) |
@@ -7310,7 +7369,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7310 | World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); | 7369 | World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); |
7311 | 7370 | ||
7312 | // this will cause the delay even if the script pin or permissions were wrong - seems ok | 7371 | // this will cause the delay even if the script pin or permissions were wrong - seems ok |
7313 | ScriptSleep(3000); | 7372 | ScriptSleep(m_sleepMsOnRemoteLoadScriptPin); |
7314 | } | 7373 | } |
7315 | 7374 | ||
7316 | public void llOpenRemoteDataChannel() | 7375 | public void llOpenRemoteDataChannel() |
@@ -7341,14 +7400,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7341 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj, | 7400 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj, |
7342 | new DetectParams[0])); | 7401 | new DetectParams[0])); |
7343 | } | 7402 | } |
7344 | ScriptSleep(1000); | 7403 | ScriptSleep(m_sleepMsOnOpenRemoteDataChannel); |
7345 | } | 7404 | } |
7346 | 7405 | ||
7347 | public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata) | 7406 | public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata) |
7348 | { | 7407 | { |
7349 | m_host.AddScriptLPS(1); | 7408 | m_host.AddScriptLPS(1); |
7350 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); | 7409 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); |
7351 | ScriptSleep(3000); | 7410 | ScriptSleep(m_sleepMsOnSendRemoteData); |
7352 | if (xmlrpcMod == null) | 7411 | if (xmlrpcMod == null) |
7353 | return ""; | 7412 | return ""; |
7354 | return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString(); | 7413 | return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString(); |
@@ -7360,7 +7419,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7360 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); | 7419 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); |
7361 | if (xmlrpcMod != null) | 7420 | if (xmlrpcMod != null) |
7362 | xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata); | 7421 | xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata); |
7363 | ScriptSleep(3000); | 7422 | ScriptSleep(m_sleepMsOnRemoteDataReply); |
7364 | } | 7423 | } |
7365 | 7424 | ||
7366 | public void llCloseRemoteDataChannel(string channel) | 7425 | public void llCloseRemoteDataChannel(string channel) |
@@ -7376,7 +7435,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7376 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); | 7435 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); |
7377 | if (xmlrpcMod != null) | 7436 | if (xmlrpcMod != null) |
7378 | xmlrpcMod.CloseXMLRPCChannel((UUID)channel); | 7437 | xmlrpcMod.CloseXMLRPCChannel((UUID)channel); |
7379 | ScriptSleep(1000); | 7438 | ScriptSleep(m_sleepMsOnCloseRemoteDataChannel); |
7380 | } | 7439 | } |
7381 | 7440 | ||
7382 | public LSL_String llMD5String(string src, int nonce) | 7441 | public LSL_String llMD5String(string src, int nonce) |
@@ -7769,7 +7828,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7769 | 7828 | ||
7770 | SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams"); | 7829 | SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams"); |
7771 | 7830 | ||
7772 | ScriptSleep(200); | 7831 | ScriptSleep(m_sleepMsOnSetPrimitiveParams); |
7773 | } | 7832 | } |
7774 | 7833 | ||
7775 | public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) | 7834 | public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) |
@@ -7778,7 +7837,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7778 | 7837 | ||
7779 | SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams"); | 7838 | SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams"); |
7780 | 7839 | ||
7781 | ScriptSleep(200); | 7840 | ScriptSleep(m_sleepMsOnSetLinkPrimitiveParams); |
7782 | } | 7841 | } |
7783 | 7842 | ||
7784 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) | 7843 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) |
@@ -9391,7 +9450,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9391 | { | 9450 | { |
9392 | m_host.AddScriptLPS(1); | 9451 | m_host.AddScriptLPS(1); |
9393 | Deprecated("llXorBase64Strings", "Use llXorBase64 instead"); | 9452 | Deprecated("llXorBase64Strings", "Use llXorBase64 instead"); |
9394 | ScriptSleep(300); | 9453 | ScriptSleep(m_sleepMsOnXorBase64Strings); |
9395 | return String.Empty; | 9454 | return String.Empty; |
9396 | } | 9455 | } |
9397 | 9456 | ||
@@ -9439,7 +9498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9439 | 9498 | ||
9440 | land.SetMusicUrl(url); | 9499 | land.SetMusicUrl(url); |
9441 | 9500 | ||
9442 | ScriptSleep(2000); | 9501 | ScriptSleep(m_sleepMsOnSetParcelMusicURL); |
9443 | } | 9502 | } |
9444 | 9503 | ||
9445 | public LSL_String llGetParcelMusicURL() | 9504 | public LSL_String llGetParcelMusicURL() |
@@ -10218,14 +10277,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10218 | public LSL_List llGetPrimMediaParams(int face, LSL_List rules) | 10277 | public LSL_List llGetPrimMediaParams(int face, LSL_List rules) |
10219 | { | 10278 | { |
10220 | m_host.AddScriptLPS(1); | 10279 | m_host.AddScriptLPS(1); |
10221 | ScriptSleep(1000); | 10280 | ScriptSleep(m_sleepMsOnGetPrimMediaParams); |
10222 | return GetPrimMediaParams(m_host, face, rules); | 10281 | return GetPrimMediaParams(m_host, face, rules); |
10223 | } | 10282 | } |
10224 | 10283 | ||
10225 | public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) | 10284 | public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) |
10226 | { | 10285 | { |
10227 | m_host.AddScriptLPS(1); | 10286 | m_host.AddScriptLPS(1); |
10228 | ScriptSleep(1000); | 10287 | ScriptSleep(m_sleepMsOnGetLinkMedia); |
10229 | if (link == ScriptBaseClass.LINK_ROOT) | 10288 | if (link == ScriptBaseClass.LINK_ROOT) |
10230 | return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); | 10289 | return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); |
10231 | else if (link == ScriptBaseClass.LINK_THIS) | 10290 | else if (link == ScriptBaseClass.LINK_THIS) |
@@ -10345,14 +10404,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10345 | public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules) | 10404 | public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules) |
10346 | { | 10405 | { |
10347 | m_host.AddScriptLPS(1); | 10406 | m_host.AddScriptLPS(1); |
10348 | ScriptSleep(1000); | 10407 | ScriptSleep(m_sleepMsOnSetPrimMediaParams); |
10349 | return SetPrimMediaParams(m_host, face, rules); | 10408 | return SetPrimMediaParams(m_host, face, rules); |
10350 | } | 10409 | } |
10351 | 10410 | ||
10352 | public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) | 10411 | public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) |
10353 | { | 10412 | { |
10354 | m_host.AddScriptLPS(1); | 10413 | m_host.AddScriptLPS(1); |
10355 | ScriptSleep(1000); | 10414 | ScriptSleep(m_sleepMsOnSetLinkMedia); |
10356 | if (link == ScriptBaseClass.LINK_ROOT) | 10415 | if (link == ScriptBaseClass.LINK_ROOT) |
10357 | return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); | 10416 | return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); |
10358 | else if (link == ScriptBaseClass.LINK_THIS) | 10417 | else if (link == ScriptBaseClass.LINK_THIS) |
@@ -10471,14 +10530,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10471 | public LSL_Integer llClearPrimMedia(LSL_Integer face) | 10530 | public LSL_Integer llClearPrimMedia(LSL_Integer face) |
10472 | { | 10531 | { |
10473 | m_host.AddScriptLPS(1); | 10532 | m_host.AddScriptLPS(1); |
10474 | ScriptSleep(1000); | 10533 | ScriptSleep(m_sleepMsOnClearPrimMedia); |
10475 | return ClearPrimMedia(m_host, face); | 10534 | return ClearPrimMedia(m_host, face); |
10476 | } | 10535 | } |
10477 | 10536 | ||
10478 | public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face) | 10537 | public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face) |
10479 | { | 10538 | { |
10480 | m_host.AddScriptLPS(1); | 10539 | m_host.AddScriptLPS(1); |
10481 | ScriptSleep(1000); | 10540 | ScriptSleep(m_sleepMsOnClearLinkMedia); |
10482 | if (link == ScriptBaseClass.LINK_ROOT) | 10541 | if (link == ScriptBaseClass.LINK_ROOT) |
10483 | return ClearPrimMedia(m_host.ParentGroup.RootPart, face); | 10542 | return ClearPrimMedia(m_host.ParentGroup.RootPart, face); |
10484 | else if (link == ScriptBaseClass.LINK_THIS) | 10543 | else if (link == ScriptBaseClass.LINK_THIS) |
@@ -11165,7 +11224,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11165 | case ScriptBaseClass.DATA_SIM_POS: | 11224 | case ScriptBaseClass.DATA_SIM_POS: |
11166 | if (info == null) | 11225 | if (info == null) |
11167 | { | 11226 | { |
11168 | ScriptSleep(1000); | 11227 | ScriptSleep(m_sleepMsOnRequestSimulatorData); |
11169 | return UUID.Zero.ToString(); | 11228 | return UUID.Zero.ToString(); |
11170 | } | 11229 | } |
11171 | 11230 | ||
@@ -11212,7 +11271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11212 | case ScriptBaseClass.DATA_SIM_RATING: | 11271 | case ScriptBaseClass.DATA_SIM_RATING: |
11213 | if (info == null) | 11272 | if (info == null) |
11214 | { | 11273 | { |
11215 | ScriptSleep(1000); | 11274 | ScriptSleep(m_sleepMsOnRequestSimulatorData); |
11216 | return UUID.Zero.ToString(); | 11275 | return UUID.Zero.ToString(); |
11217 | } | 11276 | } |
11218 | int access = info.Maturity; | 11277 | int access = info.Maturity; |
@@ -11231,7 +11290,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11231 | reply = "OpenSim"; | 11290 | reply = "OpenSim"; |
11232 | break; | 11291 | break; |
11233 | default: | 11292 | default: |
11234 | ScriptSleep(1000); | 11293 | ScriptSleep(m_sleepMsOnRequestSimulatorData); |
11235 | return UUID.Zero.ToString(); // Raise no event | 11294 | return UUID.Zero.ToString(); // Raise no event |
11236 | } | 11295 | } |
11237 | UUID rq = UUID.Random(); | 11296 | UUID rq = UUID.Random(); |
@@ -11242,7 +11301,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11242 | AsyncCommands. | 11301 | AsyncCommands. |
11243 | DataserverPlugin.DataserverReply(rq.ToString(), reply); | 11302 | DataserverPlugin.DataserverReply(rq.ToString(), reply); |
11244 | 11303 | ||
11245 | ScriptSleep(1000); | 11304 | ScriptSleep(m_sleepMsOnRequestSimulatorData); |
11246 | return tid.ToString(); | 11305 | return tid.ToString(); |
11247 | } | 11306 | } |
11248 | catch(Exception) | 11307 | catch(Exception) |
@@ -11387,7 +11446,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11387 | dm.SendUrlToUser( | 11446 | dm.SendUrlToUser( |
11388 | new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url); | 11447 | new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url); |
11389 | 11448 | ||
11390 | ScriptSleep(10000); | 11449 | ScriptSleep(m_sleepMsOnLoadURL); |
11391 | } | 11450 | } |
11392 | 11451 | ||
11393 | public void llParcelMediaCommandList(LSL_List commandList) | 11452 | public void llParcelMediaCommandList(LSL_List commandList) |
@@ -11630,7 +11689,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11630 | time); | 11689 | time); |
11631 | } | 11690 | } |
11632 | } | 11691 | } |
11633 | ScriptSleep(2000); | 11692 | ScriptSleep(m_sleepMsOnParcelMediaCommandList); |
11634 | } | 11693 | } |
11635 | 11694 | ||
11636 | public LSL_List llParcelMediaQuery(LSL_List aList) | 11695 | public LSL_List llParcelMediaQuery(LSL_List aList) |
@@ -11670,7 +11729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11670 | 11729 | ||
11671 | } | 11730 | } |
11672 | } | 11731 | } |
11673 | ScriptSleep(2000); | 11732 | ScriptSleep(m_sleepMsOnParcelMediaQuery); |
11674 | return list; | 11733 | return list; |
11675 | } | 11734 | } |
11676 | 11735 | ||
@@ -11679,7 +11738,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11679 | m_host.AddScriptLPS(1); | 11738 | m_host.AddScriptLPS(1); |
11680 | Int64 tmp = 0; | 11739 | Int64 tmp = 0; |
11681 | Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp); | 11740 | Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp); |
11682 | ScriptSleep(1000); | 11741 | ScriptSleep(m_sleepMsOnModPow); |
11683 | return Convert.ToInt32(tmp); | 11742 | return Convert.ToInt32(tmp); |
11684 | } | 11743 | } |
11685 | 11744 | ||
@@ -11762,14 +11821,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11762 | { | 11821 | { |
11763 | m_host.AddScriptLPS(1); | 11822 | m_host.AddScriptLPS(1); |
11764 | Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead"); | 11823 | Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead"); |
11765 | ScriptSleep(2000); | 11824 | ScriptSleep(m_sleepMsOnSetPrimURL); |
11766 | } | 11825 | } |
11767 | 11826 | ||
11768 | public void llRefreshPrimURL() | 11827 | public void llRefreshPrimURL() |
11769 | { | 11828 | { |
11770 | m_host.AddScriptLPS(1); | 11829 | m_host.AddScriptLPS(1); |
11771 | Deprecated("llRefreshPrimURL"); | 11830 | Deprecated("llRefreshPrimURL"); |
11772 | ScriptSleep(20000); | 11831 | ScriptSleep(m_sleepMsOnRefreshPrimURL); |
11773 | } | 11832 | } |
11774 | 11833 | ||
11775 | public LSL_String llEscapeURL(string url) | 11834 | public LSL_String llEscapeURL(string url) |
@@ -11810,7 +11869,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11810 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, | 11869 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, |
11811 | simname, pos, lookAt); | 11870 | simname, pos, lookAt); |
11812 | } | 11871 | } |
11813 | ScriptSleep(1000); | 11872 | ScriptSleep(m_sleepMsOnMapDestination); |
11814 | } | 11873 | } |
11815 | 11874 | ||
11816 | public void llAddToLandBanList(string avatar, double hours) | 11875 | public void llAddToLandBanList(string avatar, double hours) |
@@ -11851,7 +11910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11851 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); | 11910 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); |
11852 | } | 11911 | } |
11853 | } | 11912 | } |
11854 | ScriptSleep(100); | 11913 | ScriptSleep(m_sleepMsOnAddToLandBanList); |
11855 | } | 11914 | } |
11856 | 11915 | ||
11857 | public void llRemoveFromLandPassList(string avatar) | 11916 | public void llRemoveFromLandPassList(string avatar) |
@@ -11878,7 +11937,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11878 | } | 11937 | } |
11879 | } | 11938 | } |
11880 | } | 11939 | } |
11881 | ScriptSleep(100); | 11940 | ScriptSleep(m_sleepMsOnRemoveFromLandPassList); |
11882 | } | 11941 | } |
11883 | 11942 | ||
11884 | public void llRemoveFromLandBanList(string avatar) | 11943 | public void llRemoveFromLandBanList(string avatar) |
@@ -11905,7 +11964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11905 | } | 11964 | } |
11906 | } | 11965 | } |
11907 | } | 11966 | } |
11908 | ScriptSleep(100); | 11967 | ScriptSleep(m_sleepMsOnRemoveFromLandBanList); |
11909 | } | 11968 | } |
11910 | 11969 | ||
11911 | public void llSetCameraParams(LSL_List rules) | 11970 | public void llSetCameraParams(LSL_List rules) |
@@ -12288,7 +12347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12288 | } | 12347 | } |
12289 | } | 12348 | } |
12290 | } | 12349 | } |
12291 | ScriptSleep(100); | 12350 | ScriptSleep(m_sleepMsOnResetLandBanList); |
12292 | } | 12351 | } |
12293 | 12352 | ||
12294 | public void llResetLandPassList() | 12353 | public void llResetLandPassList() |
@@ -12305,7 +12364,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12305 | } | 12364 | } |
12306 | } | 12365 | } |
12307 | } | 12366 | } |
12308 | ScriptSleep(100); | 12367 | ScriptSleep(m_sleepMsOnResetLandPassList); |
12309 | } | 12368 | } |
12310 | 12369 | ||
12311 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) | 12370 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) |
@@ -12363,7 +12422,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12363 | ret.Add(new LSL_Integer(detectedParams.Value)); | 12422 | ret.Add(new LSL_Integer(detectedParams.Value)); |
12364 | } | 12423 | } |
12365 | } | 12424 | } |
12366 | ScriptSleep(2000); | 12425 | ScriptSleep(m_sleepMsOnGetParcelPrimOwners); |
12367 | return ret; | 12426 | return ret; |
12368 | } | 12427 | } |
12369 | 12428 | ||
@@ -12836,7 +12895,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12836 | { | 12895 | { |
12837 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString()); | 12896 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString()); |
12838 | 12897 | ||
12839 | ScriptSleep(100); | 12898 | ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines); |
12840 | return tid.ToString(); | 12899 | return tid.ToString(); |
12841 | } | 12900 | } |
12842 | 12901 | ||
@@ -12852,7 +12911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12852 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString()); | 12911 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString()); |
12853 | }); | 12912 | }); |
12854 | 12913 | ||
12855 | ScriptSleep(100); | 12914 | ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines); |
12856 | return tid.ToString(); | 12915 | return tid.ToString(); |
12857 | } | 12916 | } |
12858 | 12917 | ||
@@ -12888,7 +12947,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12888 | AsyncCommands.DataserverPlugin.DataserverReply( | 12947 | AsyncCommands.DataserverPlugin.DataserverReply( |
12889 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); | 12948 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); |
12890 | 12949 | ||
12891 | ScriptSleep(100); | 12950 | ScriptSleep(m_sleepMsOnGetNotecardLine); |
12892 | return tid.ToString(); | 12951 | return tid.ToString(); |
12893 | } | 12952 | } |
12894 | 12953 | ||
@@ -12907,7 +12966,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12907 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); | 12966 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); |
12908 | }); | 12967 | }); |
12909 | 12968 | ||
12910 | ScriptSleep(100); | 12969 | ScriptSleep(m_sleepMsOnGetNotecardLine); |
12911 | return tid.ToString(); | 12970 | return tid.ToString(); |
12912 | } | 12971 | } |
12913 | 12972 | ||