diff options
author | Jeff Ames | 2008-09-10 05:17:28 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-10 05:17:28 +0000 |
commit | b9b996be38f54f384ed614441e2275f3862fd540 (patch) | |
tree | ba95eb13b2f4043ea960de9e8bd79aca58f6f525 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Thank you kindly, CMickeyB for a patch that adds a (diff) | |
download | opensim-SC-b9b996be38f54f384ed614441e2275f3862fd540.zip opensim-SC-b9b996be38f54f384ed614441e2275f3862fd540.tar.gz opensim-SC-b9b996be38f54f384ed614441e2275f3862fd540.tar.bz2 opensim-SC-b9b996be38f54f384ed614441e2275f3862fd540.tar.xz |
Update svn properties, minor formatting cleanup.
Fix unreachable code due to typo in llDetectedGroup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 07d96c6..5d69673 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -229,10 +229,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
229 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 229 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
230 | if (textureManager != null) | 230 | if (textureManager != null) |
231 | { | 231 | { |
232 | if (extraParams == String.Empty) | 232 | if (extraParams == String.Empty) |
233 | { | 233 | { |
234 | extraParams = "256"; | 234 | extraParams = "256"; |
235 | } | 235 | } |
236 | UUID createdTexture = | 236 | UUID createdTexture = |
237 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 237 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
238 | extraParams, timer); | 238 | extraParams, timer); |
@@ -262,10 +262,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
262 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 262 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
263 | if (textureManager != null) | 263 | if (textureManager != null) |
264 | { | 264 | { |
265 | if (extraParams == String.Empty) | 265 | if (extraParams == String.Empty) |
266 | { | 266 | { |
267 | extraParams = "256"; | 267 | extraParams = "256"; |
268 | } | 268 | } |
269 | UUID createdTexture = | 269 | UUID createdTexture = |
270 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 270 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
271 | extraParams, timer, true, (byte) alpha); | 271 | extraParams, timer, true, (byte) alpha); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs index 0a1f2cf..02f6cfd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | |||
@@ -129,7 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
129 | { | 129 | { |
130 | m_Fields[field.Name]=field; | 130 | m_Fields[field.Name]=field; |
131 | 131 | ||
132 | if(field.FieldType is LSL_Types.list) // ref type, copy | 132 | if (field.FieldType is LSL_Types.list) // ref type, copy |
133 | { | 133 | { |
134 | LSL_Types.list v = (LSL_Types.list)field.GetValue(this); | 134 | LSL_Types.list v = (LSL_Types.list)field.GetValue(this); |
135 | Object[] data = new Object[v.Data.Length]; | 135 | Object[] data = new Object[v.Data.Length]; |