ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, minor formatting cleanup.

Browse Source 
Fix unreachable code due to typo in llDetectedGroup.
This commit is contained in:
Jeff Ames
2008-09-10 05:17:28 +00:00
parent 03672c35e4
commit b9b996be38
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -937,7 +937,7 @@ namespace OpenSim.Region.ScriptEngine.Common
EntityBase SensedObject = entityDetectedKey(number);
if (SensedObject == null)
return new LSL_Types.LSLInteger(0);
if (m_host.GroupID == m_host.ParentGroup.RootPart.GroupID) ;
if (m_host.GroupID == m_host.ParentGroup.RootPart.GroupID)
return new LSL_Types.LSLInteger(1);
return new LSL_Types.LSLInteger(0);
}

16
OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
View File

@@ -360,10 +360,10 @@ namespace OpenSim.Region.ScriptEngine.Common
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
if (textureManager != null)
{
if (extraParams == String.Empty)
{
extraParams = "256";
}
if (extraParams == String.Empty)
{
extraParams = "256";
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer);
@@ -387,10 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Common
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
if (textureManager != null)
{
if (extraParams == String.Empty)
{
extraParams = "256";
}
if (extraParams == String.Empty)
{
extraParams = "256";
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer, true, (byte) alpha);

16
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -229,10 +229,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
if (textureManager != null)
{
if (extraParams == String.Empty)
{
extraParams = "256";
}
if (extraParams == String.Empty)
{
extraParams = "256";
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer);
@@ -262,10 +262,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
if (textureManager != null)
{
if (extraParams == String.Empty)
{
extraParams = "256";
}
if (extraParams == String.Empty)
{
extraParams = "256";
}
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer, true, (byte) alpha);

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
View File

@@ -129,7 +129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
m_Fields[field.Name]=field;
if(field.FieldType is LSL_Types.list) // ref type, copy
if (field.FieldType is LSL_Types.list) // ref type, copy
{
LSL_Types.list v = (LSL_Types.list)field.GetValue(this);
Object[] data = new Object[v.Data.Length];