diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 151 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 19 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 4 | ||||
-rw-r--r-- | config/OpenSim.ini | 4 | ||||
-rw-r--r-- | config/OpenSimDefaults.ini | 3 |
5 files changed, 0 insertions, 181 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 4eda443..c195405 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -108,7 +108,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
108 | 108 | ||
109 | protected bool throwErrorOnNotImplemented = false; | 109 | protected bool throwErrorOnNotImplemented = false; |
110 | protected AsyncCommandManager AsyncCommands = null; | 110 | protected AsyncCommandManager AsyncCommands = null; |
111 | protected float m_ScriptDelayFactor = 1.0f; | ||
112 | protected float m_ScriptDistanceFactor = 1.0f; | 111 | protected float m_ScriptDistanceFactor = 1.0f; |
113 | protected float m_MinTimerInterval = 0.5f; | 112 | protected float m_MinTimerInterval = 0.5f; |
114 | protected float m_recoilScaleFactor = 0.0f; | 113 | protected float m_recoilScaleFactor = 0.0f; |
@@ -123,64 +122,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
123 | protected IUrlModule m_UrlModule = null; | 122 | protected IUrlModule m_UrlModule = null; |
124 | protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); | 123 | protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>(); |
125 | protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. | 124 | protected int EMAIL_PAUSE_TIME = 20; // documented delay value for smtp. |
126 | protected int m_sleepMsOnSetTexture = 200; | ||
127 | protected int m_sleepMsOnSetLinkTexture = 200; | ||
128 | protected int m_sleepMsOnScaleTexture = 200; | ||
129 | protected int m_sleepMsOnOffsetTexture = 200; | ||
130 | protected int m_sleepMsOnRotateTexture = 200; | ||
131 | protected int m_sleepMsOnSetPos = 200; | ||
132 | protected int m_sleepMsOnSetRot = 200; | ||
133 | protected int m_sleepMsOnSetLocalRot = 200; | ||
134 | protected int m_sleepMsOnPreloadSound = 1000; | ||
135 | protected int m_sleepMsOnMakeExplosion = 100; | ||
136 | protected int m_sleepMsOnMakeFountain = 100; | ||
137 | protected int m_sleepMsOnMakeSmoke = 100; | ||
138 | protected int m_sleepMsOnMakeFire = 100; | ||
139 | protected int m_sleepMsOnRezAtRoot = 100; | ||
140 | protected int m_sleepMsOnInstantMessage = 2000; | ||
141 | protected int m_sleepMsOnEmail = 20000; | ||
142 | protected int m_sleepMsOnCreateLink = 1000; | ||
143 | protected int m_sleepMsOnGiveInventory = 3000; | ||
144 | protected int m_sleepMsOnRequestAgentData = 100; | ||
145 | protected int m_sleepMsOnRequestInventoryData = 1000; | ||
146 | protected int m_sleepMsOnSetDamage = 5000; | ||
147 | protected int m_sleepMsOnTextBox = 1000; | ||
148 | protected int m_sleepMsOnAdjustSoundVolume = 100; | ||
149 | protected int m_sleepMsOnEjectFromLand = 5000; | ||
150 | protected int m_sleepMsOnAddToLandPassList = 100; | ||
151 | protected int m_sleepMsOnDialog = 1000; | ||
152 | protected int m_sleepMsOnRemoteLoadScript = 3000; | ||
153 | protected int m_sleepMsOnRemoteLoadScriptPin = 3000; | ||
154 | protected int m_sleepMsOnOpenRemoteDataChannel = 1000; | ||
155 | protected int m_sleepMsOnSendRemoteData = 3000; | ||
156 | protected int m_sleepMsOnRemoteDataReply = 3000; | ||
157 | protected int m_sleepMsOnCloseRemoteDataChannel = 1000; | ||
158 | protected int m_sleepMsOnSetPrimitiveParams = 200; | ||
159 | protected int m_sleepMsOnSetLinkPrimitiveParams = 200; | ||
160 | protected int m_sleepMsOnXorBase64Strings = 300; | ||
161 | protected int m_sleepMsOnSetParcelMusicURL = 2000; | ||
162 | protected int m_sleepMsOnGetPrimMediaParams = 1000; | ||
163 | protected int m_sleepMsOnGetLinkMedia = 1000; | ||
164 | protected int m_sleepMsOnSetPrimMediaParams = 1000; | ||
165 | protected int m_sleepMsOnSetLinkMedia = 1000; | ||
166 | protected int m_sleepMsOnClearPrimMedia = 1000; | ||
167 | protected int m_sleepMsOnClearLinkMedia = 1000; | ||
168 | protected int m_sleepMsOnRequestSimulatorData = 1000; | ||
169 | protected int m_sleepMsOnLoadURL = 10000; | ||
170 | protected int m_sleepMsOnParcelMediaCommandList = 2000; | ||
171 | protected int m_sleepMsOnParcelMediaQuery = 2000; | ||
172 | protected int m_sleepMsOnModPow = 1000; | ||
173 | protected int m_sleepMsOnSetPrimURL = 2000; | ||
174 | protected int m_sleepMsOnRefreshPrimURL = 20000; | ||
175 | protected int m_sleepMsOnMapDestination = 1000; | ||
176 | protected int m_sleepMsOnAddToLandBanList = 100; | ||
177 | protected int m_sleepMsOnRemoveFromLandPassList = 100; | ||
178 | protected int m_sleepMsOnRemoveFromLandBanList = 100; | ||
179 | protected int m_sleepMsOnResetLandBanList = 100; | ||
180 | protected int m_sleepMsOnResetLandPassList = 100; | ||
181 | protected int m_sleepMsOnGetParcelPrimOwners = 2000; | ||
182 | protected int m_sleepMsOnGetNumberOfNotecardLines = 100; | ||
183 | protected int m_sleepMsOnGetNotecardLine = 100; | ||
184 | protected string m_internalObjectHost = "lsl.opensim.local"; | 125 | protected string m_internalObjectHost = "lsl.opensim.local"; |
185 | protected bool m_restrictEmail = false; | 126 | protected bool m_restrictEmail = false; |
186 | protected ISoundModule m_SoundModule = null; | 127 | protected ISoundModule m_SoundModule = null; |
@@ -287,8 +228,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
287 | 228 | ||
288 | if (seConfig != null) | 229 | if (seConfig != null) |
289 | { | 230 | { |
290 | m_ScriptDelayFactor = | ||
291 | seConfig.GetFloat("ScriptDelayFactor", m_ScriptDelayFactor); | ||
292 | m_ScriptDistanceFactor = | 231 | m_ScriptDistanceFactor = |
293 | seConfig.GetFloat("ScriptDistanceLimitFactor", m_ScriptDistanceFactor); | 232 | seConfig.GetFloat("ScriptDistanceLimitFactor", m_ScriptDistanceFactor); |
294 | m_MinTimerInterval = | 233 | m_MinTimerInterval = |
@@ -376,7 +315,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
376 | m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost); | 315 | m_internalObjectHost = smtpConfig.GetString("internal_object_host", m_internalObjectHost); |
377 | } | 316 | } |
378 | } | 317 | } |
379 | m_sleepMsOnEmail = EMAIL_PAUSE_TIME * 1000; | ||
380 | } | 318 | } |
381 | 319 | ||
382 | public override Object InitializeLifetimeService() | 320 | public override Object InitializeLifetimeService() |
@@ -392,15 +330,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
392 | return lease; | 330 | return lease; |
393 | } | 331 | } |
394 | 332 | ||
395 | protected virtual void ScriptSleep(int delay) | ||
396 | { | ||
397 | delay = (int)((float)delay * m_ScriptDelayFactor); | ||
398 | if (delay == 0) | ||
399 | return; | ||
400 | |||
401 | Sleep(delay); | ||
402 | } | ||
403 | |||
404 | protected virtual void Sleep(int delay) | 333 | protected virtual void Sleep(int delay) |
405 | { | 334 | { |
406 | if (m_item == null) // Some unit tests don't set this | 335 | if (m_item == null) // Some unit tests don't set this |
@@ -2123,7 +2052,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2123 | { | 2052 | { |
2124 | m_host.AddScriptLPS(1); | 2053 | m_host.AddScriptLPS(1); |
2125 | SetTexture(m_host, texture, face); | 2054 | SetTexture(m_host, texture, face); |
2126 | ScriptSleep(m_sleepMsOnSetTexture); | ||
2127 | } | 2055 | } |
2128 | 2056 | ||
2129 | public void llSetLinkTexture(int linknumber, string texture, int face) | 2057 | public void llSetLinkTexture(int linknumber, string texture, int face) |
@@ -2134,8 +2062,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2134 | 2062 | ||
2135 | foreach (SceneObjectPart part in parts) | 2063 | foreach (SceneObjectPart part in parts) |
2136 | SetTexture(part, texture, face); | 2064 | SetTexture(part, texture, face); |
2137 | |||
2138 | ScriptSleep(m_sleepMsOnSetLinkTexture); | ||
2139 | } | 2065 | } |
2140 | 2066 | ||
2141 | protected void SetTexture(SceneObjectPart part, string texture, int face) | 2067 | protected void SetTexture(SceneObjectPart part, string texture, int face) |
@@ -2179,7 +2105,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2179 | m_host.AddScriptLPS(1); | 2105 | m_host.AddScriptLPS(1); |
2180 | 2106 | ||
2181 | ScaleTexture(m_host, u, v, face); | 2107 | ScaleTexture(m_host, u, v, face); |
2182 | ScriptSleep(m_sleepMsOnScaleTexture); | ||
2183 | } | 2108 | } |
2184 | 2109 | ||
2185 | protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) | 2110 | protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) |
@@ -2215,7 +2140,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2215 | { | 2140 | { |
2216 | m_host.AddScriptLPS(1); | 2141 | m_host.AddScriptLPS(1); |
2217 | OffsetTexture(m_host, u, v, face); | 2142 | OffsetTexture(m_host, u, v, face); |
2218 | ScriptSleep(m_sleepMsOnOffsetTexture); | ||
2219 | } | 2143 | } |
2220 | 2144 | ||
2221 | protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) | 2145 | protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) |
@@ -2251,7 +2175,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2251 | { | 2175 | { |
2252 | m_host.AddScriptLPS(1); | 2176 | m_host.AddScriptLPS(1); |
2253 | RotateTexture(m_host, rotation, face); | 2177 | RotateTexture(m_host, rotation, face); |
2254 | ScriptSleep(m_sleepMsOnRotateTexture); | ||
2255 | } | 2178 | } |
2256 | 2179 | ||
2257 | protected void RotateTexture(SceneObjectPart part, double rotation, int face) | 2180 | protected void RotateTexture(SceneObjectPart part, double rotation, int face) |
@@ -2325,8 +2248,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2325 | m_host.AddScriptLPS(1); | 2248 | m_host.AddScriptLPS(1); |
2326 | 2249 | ||
2327 | SetPos(m_host, pos, true); | 2250 | SetPos(m_host, pos, true); |
2328 | |||
2329 | ScriptSleep(m_sleepMsOnSetPos); | ||
2330 | } | 2251 | } |
2331 | 2252 | ||
2332 | /// <summary> | 2253 | /// <summary> |
@@ -2508,15 +2429,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2508 | SetRot(m_host, rootPart.RotationOffset * (Quaternion)rot); | 2429 | SetRot(m_host, rootPart.RotationOffset * (Quaternion)rot); |
2509 | } | 2430 | } |
2510 | } | 2431 | } |
2511 | |||
2512 | ScriptSleep(m_sleepMsOnSetRot); | ||
2513 | } | 2432 | } |
2514 | 2433 | ||
2515 | public void llSetLocalRot(LSL_Rotation rot) | 2434 | public void llSetLocalRot(LSL_Rotation rot) |
2516 | { | 2435 | { |
2517 | m_host.AddScriptLPS(1); | 2436 | m_host.AddScriptLPS(1); |
2518 | SetRot(m_host, rot); | 2437 | SetRot(m_host, rot); |
2519 | ScriptSleep(m_sleepMsOnSetLocalRot); | ||
2520 | } | 2438 | } |
2521 | 2439 | ||
2522 | protected void SetRot(SceneObjectPart part, Quaternion rot) | 2440 | protected void SetRot(SceneObjectPart part, Quaternion rot) |
@@ -2878,7 +2796,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2878 | m_host.AddScriptLPS(1); | 2796 | m_host.AddScriptLPS(1); |
2879 | if (m_SoundModule != null) | 2797 | if (m_SoundModule != null) |
2880 | m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0); | 2798 | m_SoundModule.PreloadSound(m_host.UUID, ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound), 0); |
2881 | ScriptSleep(m_sleepMsOnPreloadSound); | ||
2882 | } | 2799 | } |
2883 | 2800 | ||
2884 | /// <summary> | 2801 | /// <summary> |
@@ -3151,28 +3068,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3151 | { | 3068 | { |
3152 | m_host.AddScriptLPS(1); | 3069 | m_host.AddScriptLPS(1); |
3153 | Deprecated("llMakeExplosion", "Use llParticleSystem instead"); | 3070 | Deprecated("llMakeExplosion", "Use llParticleSystem instead"); |
3154 | ScriptSleep(m_sleepMsOnMakeExplosion); | ||
3155 | } | 3071 | } |
3156 | 3072 | ||
3157 | public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) | 3073 | public void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset) |
3158 | { | 3074 | { |
3159 | m_host.AddScriptLPS(1); | 3075 | m_host.AddScriptLPS(1); |
3160 | Deprecated("llMakeFountain", "Use llParticleSystem instead"); | 3076 | Deprecated("llMakeFountain", "Use llParticleSystem instead"); |
3161 | ScriptSleep(m_sleepMsOnMakeFountain); | ||
3162 | } | 3077 | } |
3163 | 3078 | ||
3164 | public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) | 3079 | public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
3165 | { | 3080 | { |
3166 | m_host.AddScriptLPS(1); | 3081 | m_host.AddScriptLPS(1); |
3167 | Deprecated("llMakeSmoke", "Use llParticleSystem instead"); | 3082 | Deprecated("llMakeSmoke", "Use llParticleSystem instead"); |
3168 | ScriptSleep(m_sleepMsOnMakeSmoke); | ||
3169 | } | 3083 | } |
3170 | 3084 | ||
3171 | public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) | 3085 | public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
3172 | { | 3086 | { |
3173 | m_host.AddScriptLPS(1); | 3087 | m_host.AddScriptLPS(1); |
3174 | Deprecated("llMakeFire", "Use llParticleSystem instead"); | 3088 | Deprecated("llMakeFire", "Use llParticleSystem instead"); |
3175 | ScriptSleep(m_sleepMsOnMakeFire); | ||
3176 | } | 3089 | } |
3177 | 3090 | ||
3178 | public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) | 3091 | public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) |
@@ -3241,9 +3154,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3241 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) | 3154 | // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) |
3242 | } | 3155 | } |
3243 | }, null, "LSL_Api.llRezAtRoot"); | 3156 | }, null, "LSL_Api.llRezAtRoot"); |
3244 | |||
3245 | //ScriptSleep((int)((groupmass * velmag) / 10)); | ||
3246 | ScriptSleep(m_sleepMsOnRezAtRoot); | ||
3247 | } | 3157 | } |
3248 | 3158 | ||
3249 | public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) | 3159 | public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param) |
@@ -3546,8 +3456,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3546 | { | 3456 | { |
3547 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 3457 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
3548 | } | 3458 | } |
3549 | |||
3550 | ScriptSleep(m_sleepMsOnInstantMessage); | ||
3551 | } | 3459 | } |
3552 | 3460 | ||
3553 | public void llEmail(string address, string subject, string message) | 3461 | public void llEmail(string address, string subject, string message) |
@@ -3585,7 +3493,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3585 | } | 3493 | } |
3586 | 3494 | ||
3587 | emailModule.SendEmail(m_host.UUID, address, subject, message); | 3495 | emailModule.SendEmail(m_host.UUID, address, subject, message); |
3588 | ScriptSleep(m_sleepMsOnEmail); | ||
3589 | } | 3496 | } |
3590 | 3497 | ||
3591 | public void llGetNextEmail(string address, string subject) | 3498 | public void llGetNextEmail(string address, string subject) |
@@ -4046,8 +3953,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4046 | 3953 | ||
4047 | if (client != null) | 3954 | if (client != null) |
4048 | parentPrim.SendPropertiesToClient(client); | 3955 | parentPrim.SendPropertiesToClient(client); |
4049 | |||
4050 | ScriptSleep(m_sleepMsOnCreateLink); | ||
4051 | } | 3956 | } |
4052 | 3957 | ||
4053 | public void llBreakLink(int linknum) | 3958 | public void llBreakLink(int linknum) |
@@ -4362,8 +4267,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4362 | 4267 | ||
4363 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 4268 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
4364 | } | 4269 | } |
4365 | |||
4366 | ScriptSleep(m_sleepMsOnGiveInventory); | ||
4367 | } | 4270 | } |
4368 | } | 4271 | } |
4369 | 4272 | ||
@@ -4533,7 +4436,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4533 | AsyncCommands. | 4436 | AsyncCommands. |
4534 | DataserverPlugin.DataserverReply(rq.ToString(), reply); | 4437 | DataserverPlugin.DataserverReply(rq.ToString(), reply); |
4535 | 4438 | ||
4536 | ScriptSleep(m_sleepMsOnRequestAgentData); | ||
4537 | return tid.ToString(); | 4439 | return tid.ToString(); |
4538 | } | 4440 | } |
4539 | 4441 | ||
@@ -4566,12 +4468,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4566 | reply); | 4468 | reply); |
4567 | }); | 4469 | }); |
4568 | 4470 | ||
4569 | ScriptSleep(m_sleepMsOnRequestInventoryData); | ||
4570 | return tid.ToString(); | 4471 | return tid.ToString(); |
4571 | } | 4472 | } |
4572 | } | 4473 | } |
4573 | 4474 | ||
4574 | ScriptSleep(m_sleepMsOnRequestInventoryData); | ||
4575 | return String.Empty; | 4475 | return String.Empty; |
4576 | } | 4476 | } |
4577 | 4477 | ||
@@ -4597,8 +4497,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4597 | } | 4497 | } |
4598 | } | 4498 | } |
4599 | } | 4499 | } |
4600 | |||
4601 | ScriptSleep(m_sleepMsOnSetDamage); | ||
4602 | } | 4500 | } |
4603 | 4501 | ||
4604 | public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt) | 4502 | public void llTeleportAgent(string agent, string destination, LSL_Vector targetPos, LSL_Vector targetLookAt) |
@@ -4714,7 +4612,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4714 | else | 4612 | else |
4715 | { | 4613 | { |
4716 | dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID); | 4614 | dm.SendTextBoxToUser(av, message, chatChannel, m_host.Name, m_host.UUID, m_host.OwnerID); |
4717 | ScriptSleep(m_sleepMsOnTextBox); | ||
4718 | } | 4615 | } |
4719 | } | 4616 | } |
4720 | 4617 | ||
@@ -6242,7 +6139,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6242 | { | 6139 | { |
6243 | m_host.AddScriptLPS(1); | 6140 | m_host.AddScriptLPS(1); |
6244 | m_host.AdjustSoundGain(volume); | 6141 | m_host.AdjustSoundGain(volume); |
6245 | ScriptSleep(m_sleepMsOnAdjustSoundVolume); | ||
6246 | } | 6142 | } |
6247 | 6143 | ||
6248 | public void llSetSoundRadius(double radius) | 6144 | public void llSetSoundRadius(double radius) |
@@ -6348,7 +6244,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6348 | } | 6244 | } |
6349 | } | 6245 | } |
6350 | } | 6246 | } |
6351 | ScriptSleep(m_sleepMsOnEjectFromLand); | ||
6352 | } | 6247 | } |
6353 | 6248 | ||
6354 | public LSL_Integer llOverMyLand(string id) | 6249 | public LSL_Integer llOverMyLand(string id) |
@@ -7323,7 +7218,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7323 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); | 7218 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); |
7324 | } | 7219 | } |
7325 | } | 7220 | } |
7326 | ScriptSleep(m_sleepMsOnAddToLandPassList); | ||
7327 | } | 7221 | } |
7328 | 7222 | ||
7329 | public void llSetTouchText(string text) | 7223 | public void llSetTouchText(string text) |
@@ -7460,8 +7354,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7460 | dm.SendDialogToUser( | 7354 | dm.SendDialogToUser( |
7461 | av, m_host.Name, m_host.UUID, m_host.OwnerID, | 7355 | av, m_host.Name, m_host.UUID, m_host.OwnerID, |
7462 | message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); | 7356 | message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); |
7463 | |||
7464 | ScriptSleep(m_sleepMsOnDialog); | ||
7465 | } | 7357 | } |
7466 | 7358 | ||
7467 | public void llVolumeDetect(int detect) | 7359 | public void llVolumeDetect(int detect) |
@@ -7476,7 +7368,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7476 | { | 7368 | { |
7477 | m_host.AddScriptLPS(1); | 7369 | m_host.AddScriptLPS(1); |
7478 | Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead"); | 7370 | Deprecated("llRemoteLoadScript", "Use llRemoteLoadScriptPin instead"); |
7479 | ScriptSleep(m_sleepMsOnRemoteLoadScript); | ||
7480 | } | 7371 | } |
7481 | 7372 | ||
7482 | public void llSetRemoteScriptAccessPin(int pin) | 7373 | public void llSetRemoteScriptAccessPin(int pin) |
@@ -7515,9 +7406,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7515 | 7406 | ||
7516 | // the rest of the permission checks are done in RezScript, so check the pin there as well | 7407 | // the rest of the permission checks are done in RezScript, so check the pin there as well |
7517 | World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); | 7408 | World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param); |
7518 | |||
7519 | // this will cause the delay even if the script pin or permissions were wrong - seems ok | ||
7520 | ScriptSleep(m_sleepMsOnRemoteLoadScriptPin); | ||
7521 | } | 7409 | } |
7522 | 7410 | ||
7523 | public void llOpenRemoteDataChannel() | 7411 | public void llOpenRemoteDataChannel() |
@@ -7548,14 +7436,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7548 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj, | 7436 | m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams("remote_data", resobj, |
7549 | new DetectParams[0])); | 7437 | new DetectParams[0])); |
7550 | } | 7438 | } |
7551 | ScriptSleep(m_sleepMsOnOpenRemoteDataChannel); | ||
7552 | } | 7439 | } |
7553 | 7440 | ||
7554 | public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata) | 7441 | public LSL_String llSendRemoteData(string channel, string dest, int idata, string sdata) |
7555 | { | 7442 | { |
7556 | m_host.AddScriptLPS(1); | 7443 | m_host.AddScriptLPS(1); |
7557 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); | 7444 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); |
7558 | ScriptSleep(m_sleepMsOnSendRemoteData); | ||
7559 | if (xmlrpcMod == null) | 7445 | if (xmlrpcMod == null) |
7560 | return ""; | 7446 | return ""; |
7561 | return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString(); | 7447 | return (xmlrpcMod.SendRemoteData(m_host.LocalId, m_item.ItemID, channel, dest, idata, sdata)).ToString(); |
@@ -7567,7 +7453,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7567 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); | 7453 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); |
7568 | if (xmlrpcMod != null) | 7454 | if (xmlrpcMod != null) |
7569 | xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata); | 7455 | xmlrpcMod.RemoteDataReply(channel, message_id, sdata, idata); |
7570 | ScriptSleep(m_sleepMsOnRemoteDataReply); | ||
7571 | } | 7456 | } |
7572 | 7457 | ||
7573 | public void llCloseRemoteDataChannel(string channel) | 7458 | public void llCloseRemoteDataChannel(string channel) |
@@ -7583,7 +7468,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7583 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); | 7468 | IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); |
7584 | if (xmlrpcMod != null) | 7469 | if (xmlrpcMod != null) |
7585 | xmlrpcMod.CloseXMLRPCChannel((UUID)channel); | 7470 | xmlrpcMod.CloseXMLRPCChannel((UUID)channel); |
7586 | ScriptSleep(m_sleepMsOnCloseRemoteDataChannel); | ||
7587 | } | 7471 | } |
7588 | 7472 | ||
7589 | public LSL_String llMD5String(string src, int nonce) | 7473 | public LSL_String llMD5String(string src, int nonce) |
@@ -7975,8 +7859,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7975 | m_host.AddScriptLPS(1); | 7859 | m_host.AddScriptLPS(1); |
7976 | 7860 | ||
7977 | SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams"); | 7861 | SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams"); |
7978 | |||
7979 | ScriptSleep(m_sleepMsOnSetPrimitiveParams); | ||
7980 | } | 7862 | } |
7981 | 7863 | ||
7982 | public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) | 7864 | public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) |
@@ -7984,8 +7866,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7984 | m_host.AddScriptLPS(1); | 7866 | m_host.AddScriptLPS(1); |
7985 | 7867 | ||
7986 | SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams"); | 7868 | SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams"); |
7987 | |||
7988 | ScriptSleep(m_sleepMsOnSetLinkPrimitiveParams); | ||
7989 | } | 7869 | } |
7990 | 7870 | ||
7991 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) | 7871 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) |
@@ -9598,7 +9478,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9598 | { | 9478 | { |
9599 | m_host.AddScriptLPS(1); | 9479 | m_host.AddScriptLPS(1); |
9600 | Deprecated("llXorBase64Strings", "Use llXorBase64 instead"); | 9480 | Deprecated("llXorBase64Strings", "Use llXorBase64 instead"); |
9601 | ScriptSleep(m_sleepMsOnXorBase64Strings); | ||
9602 | return String.Empty; | 9481 | return String.Empty; |
9603 | } | 9482 | } |
9604 | 9483 | ||
@@ -9645,8 +9524,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9645 | return; | 9524 | return; |
9646 | 9525 | ||
9647 | land.SetMusicUrl(url); | 9526 | land.SetMusicUrl(url); |
9648 | |||
9649 | ScriptSleep(m_sleepMsOnSetParcelMusicURL); | ||
9650 | } | 9527 | } |
9651 | 9528 | ||
9652 | public LSL_String llGetParcelMusicURL() | 9529 | public LSL_String llGetParcelMusicURL() |
@@ -10786,14 +10663,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10786 | public LSL_List llGetPrimMediaParams(int face, LSL_List rules) | 10663 | public LSL_List llGetPrimMediaParams(int face, LSL_List rules) |
10787 | { | 10664 | { |
10788 | m_host.AddScriptLPS(1); | 10665 | m_host.AddScriptLPS(1); |
10789 | ScriptSleep(m_sleepMsOnGetPrimMediaParams); | ||
10790 | return GetPrimMediaParams(m_host, face, rules); | 10666 | return GetPrimMediaParams(m_host, face, rules); |
10791 | } | 10667 | } |
10792 | 10668 | ||
10793 | public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) | 10669 | public LSL_List llGetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) |
10794 | { | 10670 | { |
10795 | m_host.AddScriptLPS(1); | 10671 | m_host.AddScriptLPS(1); |
10796 | ScriptSleep(m_sleepMsOnGetLinkMedia); | ||
10797 | if (link == ScriptBaseClass.LINK_ROOT) | 10672 | if (link == ScriptBaseClass.LINK_ROOT) |
10798 | return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); | 10673 | return GetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); |
10799 | else if (link == ScriptBaseClass.LINK_THIS) | 10674 | else if (link == ScriptBaseClass.LINK_THIS) |
@@ -10913,14 +10788,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10913 | public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules) | 10788 | public LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules) |
10914 | { | 10789 | { |
10915 | m_host.AddScriptLPS(1); | 10790 | m_host.AddScriptLPS(1); |
10916 | ScriptSleep(m_sleepMsOnSetPrimMediaParams); | ||
10917 | return SetPrimMediaParams(m_host, face, rules); | 10791 | return SetPrimMediaParams(m_host, face, rules); |
10918 | } | 10792 | } |
10919 | 10793 | ||
10920 | public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) | 10794 | public LSL_Integer llSetLinkMedia(LSL_Integer link, LSL_Integer face, LSL_List rules) |
10921 | { | 10795 | { |
10922 | m_host.AddScriptLPS(1); | 10796 | m_host.AddScriptLPS(1); |
10923 | ScriptSleep(m_sleepMsOnSetLinkMedia); | ||
10924 | if (link == ScriptBaseClass.LINK_ROOT) | 10797 | if (link == ScriptBaseClass.LINK_ROOT) |
10925 | return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); | 10798 | return SetPrimMediaParams(m_host.ParentGroup.RootPart, face, rules); |
10926 | else if (link == ScriptBaseClass.LINK_THIS) | 10799 | else if (link == ScriptBaseClass.LINK_THIS) |
@@ -11039,14 +10912,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11039 | public LSL_Integer llClearPrimMedia(LSL_Integer face) | 10912 | public LSL_Integer llClearPrimMedia(LSL_Integer face) |
11040 | { | 10913 | { |
11041 | m_host.AddScriptLPS(1); | 10914 | m_host.AddScriptLPS(1); |
11042 | ScriptSleep(m_sleepMsOnClearPrimMedia); | ||
11043 | return ClearPrimMedia(m_host, face); | 10915 | return ClearPrimMedia(m_host, face); |
11044 | } | 10916 | } |
11045 | 10917 | ||
11046 | public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face) | 10918 | public LSL_Integer llClearLinkMedia(LSL_Integer link, LSL_Integer face) |
11047 | { | 10919 | { |
11048 | m_host.AddScriptLPS(1); | 10920 | m_host.AddScriptLPS(1); |
11049 | ScriptSleep(m_sleepMsOnClearLinkMedia); | ||
11050 | if (link == ScriptBaseClass.LINK_ROOT) | 10921 | if (link == ScriptBaseClass.LINK_ROOT) |
11051 | return ClearPrimMedia(m_host.ParentGroup.RootPart, face); | 10922 | return ClearPrimMedia(m_host.ParentGroup.RootPart, face); |
11052 | else if (link == ScriptBaseClass.LINK_THIS) | 10923 | else if (link == ScriptBaseClass.LINK_THIS) |
@@ -11733,7 +11604,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11733 | case ScriptBaseClass.DATA_SIM_POS: | 11604 | case ScriptBaseClass.DATA_SIM_POS: |
11734 | if (info == null) | 11605 | if (info == null) |
11735 | { | 11606 | { |
11736 | ScriptSleep(m_sleepMsOnRequestSimulatorData); | ||
11737 | return UUID.Zero.ToString(); | 11607 | return UUID.Zero.ToString(); |
11738 | } | 11608 | } |
11739 | 11609 | ||
@@ -11780,7 +11650,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11780 | case ScriptBaseClass.DATA_SIM_RATING: | 11650 | case ScriptBaseClass.DATA_SIM_RATING: |
11781 | if (info == null) | 11651 | if (info == null) |
11782 | { | 11652 | { |
11783 | ScriptSleep(m_sleepMsOnRequestSimulatorData); | ||
11784 | return UUID.Zero.ToString(); | 11653 | return UUID.Zero.ToString(); |
11785 | } | 11654 | } |
11786 | int access = info.Maturity; | 11655 | int access = info.Maturity; |
@@ -11799,7 +11668,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11799 | reply = "OpenSim"; | 11668 | reply = "OpenSim"; |
11800 | break; | 11669 | break; |
11801 | default: | 11670 | default: |
11802 | ScriptSleep(m_sleepMsOnRequestSimulatorData); | ||
11803 | return UUID.Zero.ToString(); // Raise no event | 11671 | return UUID.Zero.ToString(); // Raise no event |
11804 | } | 11672 | } |
11805 | UUID rq = UUID.Random(); | 11673 | UUID rq = UUID.Random(); |
@@ -11810,7 +11678,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11810 | AsyncCommands. | 11678 | AsyncCommands. |
11811 | DataserverPlugin.DataserverReply(rq.ToString(), reply); | 11679 | DataserverPlugin.DataserverReply(rq.ToString(), reply); |
11812 | 11680 | ||
11813 | ScriptSleep(m_sleepMsOnRequestSimulatorData); | ||
11814 | return tid.ToString(); | 11681 | return tid.ToString(); |
11815 | } | 11682 | } |
11816 | catch(Exception) | 11683 | catch(Exception) |
@@ -11954,8 +11821,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11954 | if (null != dm) | 11821 | if (null != dm) |
11955 | dm.SendUrlToUser( | 11822 | dm.SendUrlToUser( |
11956 | new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url); | 11823 | new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url); |
11957 | |||
11958 | ScriptSleep(m_sleepMsOnLoadURL); | ||
11959 | } | 11824 | } |
11960 | 11825 | ||
11961 | public void llParcelMediaCommandList(LSL_List commandList) | 11826 | public void llParcelMediaCommandList(LSL_List commandList) |
@@ -12198,7 +12063,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12198 | time); | 12063 | time); |
12199 | } | 12064 | } |
12200 | } | 12065 | } |
12201 | ScriptSleep(m_sleepMsOnParcelMediaCommandList); | ||
12202 | } | 12066 | } |
12203 | 12067 | ||
12204 | public LSL_List llParcelMediaQuery(LSL_List aList) | 12068 | public LSL_List llParcelMediaQuery(LSL_List aList) |
@@ -12238,7 +12102,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12238 | 12102 | ||
12239 | } | 12103 | } |
12240 | } | 12104 | } |
12241 | ScriptSleep(m_sleepMsOnParcelMediaQuery); | ||
12242 | return list; | 12105 | return list; |
12243 | } | 12106 | } |
12244 | 12107 | ||
@@ -12247,7 +12110,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12247 | m_host.AddScriptLPS(1); | 12110 | m_host.AddScriptLPS(1); |
12248 | Int64 tmp = 0; | 12111 | Int64 tmp = 0; |
12249 | Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp); | 12112 | Math.DivRem(Convert.ToInt64(Math.Pow(a, b)), c, out tmp); |
12250 | ScriptSleep(m_sleepMsOnModPow); | ||
12251 | return Convert.ToInt32(tmp); | 12113 | return Convert.ToInt32(tmp); |
12252 | } | 12114 | } |
12253 | 12115 | ||
@@ -12330,14 +12192,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12330 | { | 12192 | { |
12331 | m_host.AddScriptLPS(1); | 12193 | m_host.AddScriptLPS(1); |
12332 | Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead"); | 12194 | Deprecated("llSetPrimURL", "Use llSetPrimMediaParams instead"); |
12333 | ScriptSleep(m_sleepMsOnSetPrimURL); | ||
12334 | } | 12195 | } |
12335 | 12196 | ||
12336 | public void llRefreshPrimURL() | 12197 | public void llRefreshPrimURL() |
12337 | { | 12198 | { |
12338 | m_host.AddScriptLPS(1); | 12199 | m_host.AddScriptLPS(1); |
12339 | Deprecated("llRefreshPrimURL"); | 12200 | Deprecated("llRefreshPrimURL"); |
12340 | ScriptSleep(m_sleepMsOnRefreshPrimURL); | ||
12341 | } | 12201 | } |
12342 | 12202 | ||
12343 | public LSL_String llEscapeURL(string url) | 12203 | public LSL_String llEscapeURL(string url) |
@@ -12378,7 +12238,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12378 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, | 12238 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, |
12379 | simname, pos, lookAt); | 12239 | simname, pos, lookAt); |
12380 | } | 12240 | } |
12381 | ScriptSleep(m_sleepMsOnMapDestination); | ||
12382 | } | 12241 | } |
12383 | 12242 | ||
12384 | public void llAddToLandBanList(string avatar, double hours) | 12243 | public void llAddToLandBanList(string avatar, double hours) |
@@ -12419,7 +12278,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12419 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); | 12278 | World.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land); |
12420 | } | 12279 | } |
12421 | } | 12280 | } |
12422 | ScriptSleep(m_sleepMsOnAddToLandBanList); | ||
12423 | } | 12281 | } |
12424 | 12282 | ||
12425 | public void llRemoveFromLandPassList(string avatar) | 12283 | public void llRemoveFromLandPassList(string avatar) |
@@ -12446,7 +12304,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12446 | } | 12304 | } |
12447 | } | 12305 | } |
12448 | } | 12306 | } |
12449 | ScriptSleep(m_sleepMsOnRemoveFromLandPassList); | ||
12450 | } | 12307 | } |
12451 | 12308 | ||
12452 | public void llRemoveFromLandBanList(string avatar) | 12309 | public void llRemoveFromLandBanList(string avatar) |
@@ -12473,7 +12330,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12473 | } | 12330 | } |
12474 | } | 12331 | } |
12475 | } | 12332 | } |
12476 | ScriptSleep(m_sleepMsOnRemoveFromLandBanList); | ||
12477 | } | 12333 | } |
12478 | 12334 | ||
12479 | public void llSetCameraParams(LSL_List rules) | 12335 | public void llSetCameraParams(LSL_List rules) |
@@ -12856,7 +12712,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12856 | } | 12712 | } |
12857 | } | 12713 | } |
12858 | } | 12714 | } |
12859 | ScriptSleep(m_sleepMsOnResetLandBanList); | ||
12860 | } | 12715 | } |
12861 | 12716 | ||
12862 | public void llResetLandPassList() | 12717 | public void llResetLandPassList() |
@@ -12873,7 +12728,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12873 | } | 12728 | } |
12874 | } | 12729 | } |
12875 | } | 12730 | } |
12876 | ScriptSleep(m_sleepMsOnResetLandPassList); | ||
12877 | } | 12731 | } |
12878 | 12732 | ||
12879 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) | 12733 | public LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide) |
@@ -12931,7 +12785,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12931 | ret.Add(new LSL_Integer(detectedParams.Value)); | 12785 | ret.Add(new LSL_Integer(detectedParams.Value)); |
12932 | } | 12786 | } |
12933 | } | 12787 | } |
12934 | ScriptSleep(m_sleepMsOnGetParcelPrimOwners); | ||
12935 | return ret; | 12788 | return ret; |
12936 | } | 12789 | } |
12937 | 12790 | ||
@@ -13433,7 +13286,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13433 | { | 13286 | { |
13434 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString()); | 13287 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString()); |
13435 | 13288 | ||
13436 | ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines); | ||
13437 | return tid.ToString(); | 13289 | return tid.ToString(); |
13438 | } | 13290 | } |
13439 | 13291 | ||
@@ -13449,7 +13301,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13449 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString()); | 13301 | AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString()); |
13450 | }); | 13302 | }); |
13451 | 13303 | ||
13452 | ScriptSleep(m_sleepMsOnGetNumberOfNotecardLines); | ||
13453 | return tid.ToString(); | 13304 | return tid.ToString(); |
13454 | } | 13305 | } |
13455 | 13306 | ||
@@ -13485,7 +13336,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13485 | AsyncCommands.DataserverPlugin.DataserverReply( | 13336 | AsyncCommands.DataserverPlugin.DataserverReply( |
13486 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); | 13337 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); |
13487 | 13338 | ||
13488 | ScriptSleep(m_sleepMsOnGetNotecardLine); | ||
13489 | return tid.ToString(); | 13339 | return tid.ToString(); |
13490 | } | 13340 | } |
13491 | 13341 | ||
@@ -13504,7 +13354,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13504 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); | 13354 | reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); |
13505 | }); | 13355 | }); |
13506 | 13356 | ||
13507 | ScriptSleep(m_sleepMsOnGetNotecardLine); | ||
13508 | return tid.ToString(); | 13357 | return tid.ToString(); |
13509 | } | 13358 | } |
13510 | 13359 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index e799714..2588d51 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -138,7 +138,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
138 | internal TaskInventoryItem m_item; | 138 | internal TaskInventoryItem m_item; |
139 | internal bool m_OSFunctionsEnabled = false; | 139 | internal bool m_OSFunctionsEnabled = false; |
140 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; | 140 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; |
141 | internal float m_ScriptDelayFactor = 1.0f; | ||
142 | internal float m_ScriptDistanceFactor = 1.0f; | 141 | internal float m_ScriptDistanceFactor = 1.0f; |
143 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); | 142 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); |
144 | 143 | ||
@@ -159,8 +158,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
159 | // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); | 158 | // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); |
160 | } | 159 | } |
161 | 160 | ||
162 | m_ScriptDelayFactor = | ||
163 | m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); | ||
164 | m_ScriptDistanceFactor = | 161 | m_ScriptDistanceFactor = |
165 | m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); | 162 | m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); |
166 | 163 | ||
@@ -427,14 +424,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
427 | OSSLShoutError(string.Format("Use of function {0} is deprecated. Use {1} instead.", function, replacement)); | 424 | OSSLShoutError(string.Format("Use of function {0} is deprecated. Use {1} instead.", function, replacement)); |
428 | } | 425 | } |
429 | 426 | ||
430 | protected void ScriptSleep(int delay) | ||
431 | { | ||
432 | delay = (int)((float)delay * m_ScriptDelayFactor); | ||
433 | if (delay == 0) | ||
434 | return; | ||
435 | System.Threading.Thread.Sleep(delay); | ||
436 | } | ||
437 | |||
438 | public LSL_Integer osSetTerrainHeight(int x, int y, double val) | 427 | public LSL_Integer osSetTerrainHeight(int x, int y, double val) |
439 | { | 428 | { |
440 | CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight"); | 429 | CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight"); |
@@ -799,9 +788,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
799 | presence.ControllingClient, regionName, position, | 788 | presence.ControllingClient, regionName, position, |
800 | lookat, (uint)TPFlags.ViaLocation), | 789 | lookat, (uint)TPFlags.ViaLocation), |
801 | null, "OSSL_Api.TeleportAgentByRegionCoords"); | 790 | null, "OSSL_Api.TeleportAgentByRegionCoords"); |
802 | |||
803 | ScriptSleep(5000); | ||
804 | |||
805 | // } | 791 | // } |
806 | 792 | ||
807 | } | 793 | } |
@@ -847,9 +833,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
847 | presence.ControllingClient, regionHandle, | 833 | presence.ControllingClient, regionHandle, |
848 | position, lookat, (uint)TPFlags.ViaLocation), | 834 | position, lookat, (uint)TPFlags.ViaLocation), |
849 | null, "OSSL_Api.TeleportAgentByRegionName"); | 835 | null, "OSSL_Api.TeleportAgentByRegionName"); |
850 | |||
851 | ScriptSleep(5000); | ||
852 | |||
853 | // } | 836 | // } |
854 | 837 | ||
855 | } | 838 | } |
@@ -3138,8 +3121,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3138 | if (region != null) | 3121 | if (region != null) |
3139 | key = region.TerrainImage; | 3122 | key = region.TerrainImage; |
3140 | 3123 | ||
3141 | ScriptSleep(1000); | ||
3142 | |||
3143 | return key.ToString(); | 3124 | return key.ToString(); |
3144 | } | 3125 | } |
3145 | 3126 | ||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 07ed21d..82a5c87 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -938,10 +938,6 @@ | |||
938 | ;; If a script overruns it's event limit, kill the script? | 938 | ;; If a script overruns it's event limit, kill the script? |
939 | ; KillTimedOutScripts = false | 939 | ; KillTimedOutScripts = false |
940 | 940 | ||
941 | ;# {ScriptDelayFactor} {} {Multiplier for scripting delays} {} 1.0 | ||
942 | ;; Sets the multiplier for the scripting delays | ||
943 | ; ScriptDelayFactor = 1.0 | ||
944 | |||
945 | ;# {ScriptDistanceLimitFactor} {} {Multiplier for 10.0m distance limits?} {} | 941 | ;# {ScriptDistanceLimitFactor} {} {Multiplier for 10.0m distance limits?} {} |
946 | ;; The factor the 10 m distances limits are multiplied by | 942 | ;; The factor the 10 m distances limits are multiplied by |
947 | ; ScriptDistanceLimitFactor = 1.0 | 943 | ; ScriptDistanceLimitFactor = 1.0 |
diff --git a/config/OpenSim.ini b/config/OpenSim.ini index 899c685..02aca2c 100644 --- a/config/OpenSim.ini +++ b/config/OpenSim.ini | |||
@@ -938,10 +938,6 @@ | |||
938 | ;; If a script overruns it's event limit, kill the script? | 938 | ;; If a script overruns it's event limit, kill the script? |
939 | ; KillTimedOutScripts = false | 939 | ; KillTimedOutScripts = false |
940 | 940 | ||
941 | ;# {ScriptDelayFactor} {} {Multiplier for scripting delays} {} 1.0 | ||
942 | ;; Sets the multiplier for the scripting delays | ||
943 | ; ScriptDelayFactor = 1.0 | ||
944 | |||
945 | ;# {ScriptDistanceLimitFactor} {} {Multiplier for 10.0m distance limits?} {} | 941 | ;# {ScriptDistanceLimitFactor} {} {Multiplier for 10.0m distance limits?} {} |
946 | ;; The factor the 10 m distances limits are multiplied by | 942 | ;; The factor the 10 m distances limits are multiplied by |
947 | ; ScriptDistanceLimitFactor = 1.0 | 943 | ; ScriptDistanceLimitFactor = 1.0 |
diff --git a/config/OpenSimDefaults.ini b/config/OpenSimDefaults.ini index 7ed31d4..e0957e3 100644 --- a/config/OpenSimDefaults.ini +++ b/config/OpenSimDefaults.ini | |||
@@ -1762,9 +1762,6 @@ | |||
1762 | ; before aborting the thread (such as when an object containing scripts is taken into inventory). | 1762 | ; before aborting the thread (such as when an object containing scripts is taken into inventory). |
1763 | WaitForEventCompletionOnScriptStop = 1000; | 1763 | WaitForEventCompletionOnScriptStop = 1000; |
1764 | 1764 | ||
1765 | ; Sets the multiplier for the scripting delays | ||
1766 | ScriptDelayFactor = 1.0 | ||
1767 | |||
1768 | ; The factor the 10 m distances llimits are multiplied by | 1765 | ; The factor the 10 m distances llimits are multiplied by |
1769 | ScriptDistanceLimitFactor = 1.0 | 1766 | ScriptDistanceLimitFactor = 1.0 |
1770 | 1767 | ||