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 | |
parent | Thank you kindly, CMickeyB for a patch that adds a (diff) | |
download | opensim-SC_OLD-b9b996be38f54f384ed614441e2275f3862fd540.zip opensim-SC_OLD-b9b996be38f54f384ed614441e2275f3862fd540.tar.gz opensim-SC_OLD-b9b996be38f54f384ed614441e2275f3862fd540.tar.bz2 opensim-SC_OLD-b9b996be38f54f384ed614441e2275f3862fd540.tar.xz |
Update svn properties, minor formatting cleanup.
Fix unreachable code due to typo in llDetectedGroup.
Diffstat (limited to 'OpenSim/Region')
6 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ffd7001..6235381 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3405,7 +3405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3405 | 3405 | ||
3406 | List<string> msg = new List<string>(); | 3406 | List<string> msg = new List<string>(); |
3407 | 3407 | ||
3408 | if(handlerGenericMessage != null) | 3408 | if (handlerGenericMessage != null) |
3409 | { | 3409 | { |
3410 | string method = Util.FieldToString(gmpack.MethodData.Method); | 3410 | string method = Util.FieldToString(gmpack.MethodData.Method); |
3411 | foreach (GenericMessagePacket.ParamListBlock block in gmpack.ParamList) | 3411 | foreach (GenericMessagePacket.ParamListBlock block in gmpack.ParamList) |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 20b203a..a4491f6 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -467,7 +467,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
467 | 467 | ||
468 | public void SendGenericMessage(string method, List<string> message) | 468 | public void SendGenericMessage(string method, List<string> message) |
469 | { | 469 | { |
470 | 470 | ||
471 | } | 471 | } |
472 | 472 | ||
473 | public virtual void SendLayerData(float[] map) | 473 | public virtual void SendLayerData(float[] map) |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 9f13a10..6575eee 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -937,7 +937,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
937 | EntityBase SensedObject = entityDetectedKey(number); | 937 | EntityBase SensedObject = entityDetectedKey(number); |
938 | if (SensedObject == null) | 938 | if (SensedObject == null) |
939 | return new LSL_Types.LSLInteger(0); | 939 | return new LSL_Types.LSLInteger(0); |
940 | if (m_host.GroupID == m_host.ParentGroup.RootPart.GroupID) ; | 940 | if (m_host.GroupID == m_host.ParentGroup.RootPart.GroupID) |
941 | return new LSL_Types.LSLInteger(1); | 941 | return new LSL_Types.LSLInteger(1); |
942 | return new LSL_Types.LSLInteger(0); | 942 | return new LSL_Types.LSLInteger(0); |
943 | } | 943 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index ad58069..8b5e879 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | |||
@@ -360,10 +360,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
360 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 360 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
361 | if (textureManager != null) | 361 | if (textureManager != null) |
362 | { | 362 | { |
363 | if (extraParams == String.Empty) | 363 | if (extraParams == String.Empty) |
364 | { | 364 | { |
365 | extraParams = "256"; | 365 | extraParams = "256"; |
366 | } | 366 | } |
367 | UUID createdTexture = | 367 | UUID createdTexture = |
368 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 368 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
369 | extraParams, timer); | 369 | extraParams, timer); |
@@ -387,10 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
387 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 387 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
388 | if (textureManager != null) | 388 | if (textureManager != null) |
389 | { | 389 | { |
390 | if (extraParams == String.Empty) | 390 | if (extraParams == String.Empty) |
391 | { | 391 | { |
392 | extraParams = "256"; | 392 | extraParams = "256"; |
393 | } | 393 | } |
394 | UUID createdTexture = | 394 | UUID createdTexture = |
395 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 395 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
396 | extraParams, timer, true, (byte) alpha); | 396 | extraParams, timer, true, (byte) alpha); |
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]; |