aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorJeff Ames2008-09-10 05:17:28 +0000
committerJeff Ames2008-09-10 05:17:28 +0000
commitb9b996be38f54f384ed614441e2275f3862fd540 (patch)
treeba95eb13b2f4043ea960de9e8bd79aca58f6f525 /OpenSim/Region/ScriptEngine/Common
parentThank you kindly, CMickeyB for a patch that adds a (diff)
downloadopensim-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/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs16
2 files changed, 9 insertions, 9 deletions
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);