diff options
author | Dr Scofield | 2008-09-18 16:53:26 +0000 |
---|---|---|
committer | Dr Scofield | 2008-09-18 16:53:26 +0000 |
commit | 0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0 (patch) | |
tree | 446e13c296397ea90bf3ba2ffabd8dcdfa6e2932 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.zip opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.tar.gz opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.tar.bz2 opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.tar.xz |
From: Robert Smart (SMARTROB@uk.ibm.com)
Patch for new scripting method osParseJSON.
also, a couple of warning bugs killed.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b77676c..1c108b7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
139 | if (m_host.ParentGroup != null) | 139 | if (m_host.ParentGroup != null) |
140 | return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values); | 140 | return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values); |
141 | return ret; | 141 | return ret; |
142 | break; | 142 | |
143 | case ScriptBaseClass.LINK_ROOT: | 143 | case ScriptBaseClass.LINK_ROOT: |
144 | if (m_host.ParentGroup != null) | 144 | if (m_host.ParentGroup != null) |
145 | { | 145 | { |
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
148 | return ret; | 148 | return ret; |
149 | } | 149 | } |
150 | return ret; | 150 | return ret; |
151 | break; | 151 | |
152 | case ScriptBaseClass.LINK_ALL_OTHERS: | 152 | case ScriptBaseClass.LINK_ALL_OTHERS: |
153 | if (m_host.ParentGroup == null) | 153 | if (m_host.ParentGroup == null) |
154 | return new List<SceneObjectPart>(); | 154 | return new List<SceneObjectPart>(); |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
156 | if (ret.Contains(m_host)) | 156 | if (ret.Contains(m_host)) |
157 | ret.Remove(m_host); | 157 | ret.Remove(m_host); |
158 | return ret; | 158 | return ret; |
159 | break; | 159 | |
160 | case ScriptBaseClass.LINK_ALL_CHILDREN: | 160 | case ScriptBaseClass.LINK_ALL_CHILDREN: |
161 | if (m_host.ParentGroup == null) | 161 | if (m_host.ParentGroup == null) |
162 | return new List<SceneObjectPart>(); | 162 | return new List<SceneObjectPart>(); |
@@ -164,10 +164,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
164 | if (ret.Contains(m_host.ParentGroup.RootPart)) | 164 | if (ret.Contains(m_host.ParentGroup.RootPart)) |
165 | ret.Remove(m_host.ParentGroup.RootPart); | 165 | ret.Remove(m_host.ParentGroup.RootPart); |
166 | return ret; | 166 | return ret; |
167 | break; | 167 | |
168 | case ScriptBaseClass.LINK_THIS: | 168 | case ScriptBaseClass.LINK_THIS: |
169 | return ret; | 169 | return ret; |
170 | break; | 170 | |
171 | default: | 171 | default: |
172 | if (linkType < 0 || m_host.ParentGroup == null) | 172 | if (linkType < 0 || m_host.ParentGroup == null) |
173 | return new List<SceneObjectPart>(); | 173 | return new List<SceneObjectPart>(); |
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
177 | ret = new List<SceneObjectPart>(); | 177 | ret = new List<SceneObjectPart>(); |
178 | ret.Add(target); | 178 | ret.Add(target); |
179 | return ret; | 179 | return ret; |
180 | break; | 180 | |
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||