diff options
| author | Melanie | 2010-10-21 20:26:29 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 20:26:29 +0100 |
| commit | 28c4dd7931281f0b36a9d81cd17aef03057bcc39 (patch) | |
| tree | 6ea6acd8f8bd636e5f5c82edc9cc0bacedb7aabc /OpenSim/Region/ScriptEngine | |
| parent | COnvert some funky K&R notation to proper (MS) style (diff) | |
| parent | This fixes a delay in llSetLinkPrimitiveParamsFast (diff) | |
| download | opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.zip opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.gz opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.bz2 opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 296a50e..f55bd12 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -7251,7 +7251,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7251 | 7251 | ||
| 7252 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) | 7252 | public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) |
| 7253 | { | 7253 | { |
| 7254 | m_host.AddScriptLPS(1); | 7254 | m_host.AddScriptLPS(1); |
| 7255 | 7255 | ||
| 7256 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | 7256 | List<SceneObjectPart> parts = GetLinkParts(linknumber); |
| 7257 | List<ScenePresence> avatars = GetLinkAvatars(linknumber); | 7257 | List<ScenePresence> avatars = GetLinkAvatars(linknumber); |
| @@ -7318,7 +7318,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7318 | break; | 7318 | break; |
| 7319 | } | 7319 | } |
| 7320 | } | 7320 | } |
| 7321 | |||
| 7322 | } | 7321 | } |
| 7323 | 7322 | ||
| 7324 | protected void SetPrimParams(SceneObjectPart part, LSL_List rules) | 7323 | protected void SetPrimParams(SceneObjectPart part, LSL_List rules) |