OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup. 

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

4
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -133,7 +133,7 @@ namespace OpenSim.Data.SQLite
ds.Tables.Add(createItemsTable());
setupItemsCommands(itemsDa, m_conn);
itemsDa.Fill(ds.Tables["primitems"]);
ds.Tables.Add(createTerrainTable());
setupTerrainCommands(terrainDa, m_conn);
@ -990,7 +990,7 @@ namespace OpenSim.Data.SQLite
cmd.ExecuteNonQuery();
}
prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorR"]), Convert.ToInt32(row["ColorB"]), Convert.ToInt32(row["ColorG"]));
return prim;
}

2
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3405,7 +3405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
List<string> msg = new List<string>();
if(handlerGenericMessage != null)
if (handlerGenericMessage != null)
{
string method = Util.FieldToString(gmpack.MethodData.Method);
foreach (GenericMessagePacket.ParamListBlock block in gmpack.ParamList)

2
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -467,7 +467,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
public void SendGenericMessage(string method, List<string> message)
{
}
public virtual void SendLayerData(float[] map)

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];