diff options
author | Melanie | 2012-08-16 01:01:03 +0200 |
---|---|---|
committer | Melanie | 2012-08-16 01:01:03 +0200 |
commit | 4e5c19595c663d29e881a08ac5b0325301473b93 (patch) | |
tree | 8ee4b4294c032af1777a12a4f14e608c7a3ce723 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Remove XML debug spam from vivox voice (diff) | |
download | opensim-SC-4e5c19595c663d29e881a08ac5b0325301473b93.zip opensim-SC-4e5c19595c663d29e881a08ac5b0325301473b93.tar.gz opensim-SC-4e5c19595c663d29e881a08ac5b0325301473b93.tar.bz2 opensim-SC-4e5c19595c663d29e881a08ac5b0325301473b93.tar.xz |
Fix casts and calls for link primitive param setting for avatars
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c4109dd..5264613 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7782,8 +7782,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7782 | 7782 | ||
7783 | if (parts.Count > 0) | 7783 | if (parts.Count > 0) |
7784 | { | 7784 | { |
7785 | foreach (SceneObjectPart part in parts) | 7785 | foreach (object part in parts) |
7786 | remaining = SetPrimParams(part, rules); | 7786 | { |
7787 | if (part is SceneObjectPart) | ||
7788 | remaining = SetPrimParams((SceneObjectPart)part, rules); | ||
7789 | else | ||
7790 | remaining = SetPrimParams((ScenePresence)part, rules); | ||
7791 | } | ||
7787 | 7792 | ||
7788 | while((object)remaining != null && remaining.Length > 2) | 7793 | while((object)remaining != null && remaining.Length > 2) |
7789 | { | 7794 | { |
@@ -7797,8 +7802,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7797 | foreach (ScenePresence p in avatars) | 7802 | foreach (ScenePresence p in avatars) |
7798 | parts.Add(p); | 7803 | parts.Add(p); |
7799 | 7804 | ||
7800 | foreach (SceneObjectPart part in parts) | 7805 | foreach (object part in parts) |
7801 | remaining = SetPrimParams(part, rules); | 7806 | { |
7807 | if (part is SceneObjectPart) | ||
7808 | remaining = SetPrimParams((SceneObjectPart)part, rules); | ||
7809 | else | ||
7810 | remaining = SetPrimParams((ScenePresence)part, rules); | ||
7811 | } | ||
7802 | } | 7812 | } |
7803 | } | 7813 | } |
7804 | } | 7814 | } |