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

Started to rename "OpenSim.World" to "OpenSim.Region" for lbsa71 as we aim to please!

Sugilite
MW 2007-06-10 12:18:22 +00:00
parent 93f07a9fce
commit 1b1226a483
23 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim.build
View File

@ -51,7 +51,7 @@
<nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
<nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.World/OpenSim.Region.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
<nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
@ -87,7 +87,7 @@
<nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim.World/OpenSim.Region.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />
</target>
@ -104,7 +104,7 @@
<nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
<nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.World/OpenSim.Region.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
<nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />

12
OpenSim.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.World", "OpenSim\OpenSim.World\OpenSim.World.csproj", "{642A14A8-0000-0000-0000-000000000000}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region", "OpenSim\OpenSim.World\OpenSim.Region.csproj", "{196916AF-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
EndProject
@ -66,10 +66,10 @@ Global
{683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

2
OpenSim/OpenSim.World/Avatar.Client.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife.Packets;
namespace OpenSim.world
namespace OpenSim.Region
{
partial class Avatar
{

2
OpenSim/OpenSim.World/Avatar.Update.cs
View File

@ -6,7 +6,7 @@ using libsecondlife.Packets;
using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
namespace OpenSim.world
namespace OpenSim.Region
{
partial class Avatar
{

2
OpenSim/OpenSim.World/Avatar.cs
View File

@ -10,7 +10,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using Axiom.MathLib;
namespace OpenSim.world
namespace OpenSim.Region
{
public partial class Avatar : Entity
{

4
OpenSim/OpenSim.World/AvatarAnimations.cs
View File

@ -31,7 +31,7 @@ using System.Text;
using libsecondlife;
using System.Xml;
namespace OpenSim
namespace OpenSim.Region
{
public class AvatarAnimations
{
@ -64,7 +64,7 @@ namespace OpenSim
// OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
{
AnimsNames.Add(kp.Value, kp.Key);
}

4
OpenSim/OpenSim.World/Entity.cs
View File

@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Text;
using Axiom.MathLib;
using OpenSim.Physics.Manager;
using OpenSim.types;
using OpenSim.Region.types;
using libsecondlife;
using OpenSim.RegionServer.world.scripting;
namespace OpenSim.world
namespace OpenSim.Region
{
public abstract class Entity : IScriptReadonlyEntity
{

4
OpenSim/OpenSim.World/Estate/EstateManager.cs
View File

@ -4,13 +4,13 @@ using System.Text;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.world;
using OpenSim.Region;
using OpenSim;
using libsecondlife;
using libsecondlife.Packets;
namespace OpenSim.world.Estate
namespace OpenSim.Region.Estate
{
/// <summary>

6
OpenSim/OpenSim.World/ParcelManager.cs
View File

@ -33,7 +33,7 @@ using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
namespace OpenSim.world
namespace OpenSim.Region
{
@ -418,7 +418,7 @@ namespace OpenSim.world
{
for (y = 0; y < inc_y; y++)
{
OpenSim.world.Parcel currentParcel = getParcel(start_x + x, start_y + y);
OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
if (!temp.Contains(currentParcel))
{
currentParcel.forceUpdateParcelInfo();
@ -648,7 +648,7 @@ namespace OpenSim.world
sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
}
}
}
}
#endregion

8
OpenSim/OpenSim.World/Primitive.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.types;
using OpenSim.Region.types;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
@ -9,7 +9,7 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
namespace OpenSim.world
namespace OpenSim.Region
{
public class Primitive : Entity
{
@ -84,9 +84,9 @@ namespace OpenSim.world
dataArrays.Add(primData.ToBytes());
foreach (Entity child in children)
{
if (child is OpenSim.world.Primitive)
if (child is OpenSim.Region.Primitive)
{
dataArrays.Add(((OpenSim.world.Primitive)child).GetByteArray());
dataArrays.Add(((OpenSim.Region.Primitive)child).GetByteArray());
}
}
byte[] primstart = Helpers.StringToField("<Prim>");

4
OpenSim/OpenSim.World/SceneObject.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.types;
using OpenSim.Region.types;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
@ -9,7 +9,7 @@ using OpenSim.Physics.Manager;
using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
namespace OpenSim.world
namespace OpenSim.Region
{
public class SceneObject : Entity
{

2
OpenSim/OpenSim.World/World.PacketHandlers.cs
View File

@ -9,7 +9,7 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
namespace OpenSim.world
namespace OpenSim.Region
{
public partial class World
{

2
OpenSim/OpenSim.World/World.Scripting.cs
View File

@ -8,7 +8,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using libsecondlife;
namespace OpenSim.world
namespace OpenSim.Region
{
public partial class World
{

6
OpenSim/OpenSim.World/World.cs
View File

@ -15,10 +15,10 @@ using OpenSim.Framework;
using OpenSim.RegionServer.world.scripting;
using OpenSim.Terrain;
using OpenGrid.Framework.Communications;
using OpenSim.world.Estate;
using OpenSim.Region.Estate;
namespace OpenSim.world
namespace OpenSim.Region
{
public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
{
@ -218,7 +218,7 @@ namespace OpenSim.world
//Parcel backup routines
ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
int i = 0;
foreach (OpenSim.world.Parcel parcel in parcelManager.parcelList.Values)
foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
{
parcels[i] = parcel.parcelData;
i++;

2
OpenSim/OpenSim.World/WorldBase.cs
View File

@ -13,7 +13,7 @@ using OpenSim.Framework.Inventory;
using OpenSim.RegionServer.world.scripting;
using OpenSim.Terrain;
namespace OpenSim.world
namespace OpenSim.Region
{
public abstract class WorldBase : IWorld
{

6
OpenSim/OpenSim.World/scripting/IScriptHandler.cs
View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
using OpenSim.Physics.Manager;
using OpenSim.world;
using Avatar=OpenSim.world.Avatar;
using Primitive = OpenSim.world.Primitive;
using OpenSim.Region;
using Avatar=OpenSim.Region.Avatar;
using Primitive = OpenSim.Region.Primitive;
namespace OpenSim.RegionServer.world.scripting
{

2
OpenSim/OpenSim.World/types/Mesh.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.types
namespace OpenSim.Region.types
{
// TODO: This will need some performance tuning no doubt.
public class Mesh

2
OpenSim/OpenSim.World/types/Triangle.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using Axiom.MathLib;
namespace OpenSim.types
namespace OpenSim.Region.types
{
public class Triangle
{

2
OpenSim/OpenSim/Application.cs
View File

@ -82,7 +82,7 @@ namespace OpenSim
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
OpenSim.Region.Avatar.PhysicsEngineFlying = allowFlying;
sim.StartUp();

6
OpenSim/OpenSim/OpenSim.csproj
View File

@ -110,9 +110,9 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\OpenSim.World\OpenSim.World.csproj">
<Name>OpenSim.World</Name>
<Project>{642A14A8-0000-0000-0000-000000000000}</Project>
<ProjectReference Include="..\OpenSim.World\OpenSim.Region.csproj">
<Name>OpenSim.Region</Name>
<Project>{196916AF-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>

2
OpenSim/OpenSim/OpenSim.exe.build
View File

@ -29,7 +29,7 @@
<include name="../../bin/OpenSim.Framework.Console.dll" />
<include name="../../bin/OpenSim.Physics.Manager.dll" />
<include name="../../bin/OpenSim.Servers.dll" />
<include name="../../bin/OpenSim.World.dll" />
<include name="../../bin/OpenSim.Region.dll" />
<include name="../../bin/OpenSim.RegionServer.dll" />
<include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
<include name="../../bin/OpenGrid.Framework.Communications.dll" />

12
OpenSim/OpenSim/OpenSimMain.cs
View File

@ -38,7 +38,7 @@ using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.world;
using OpenSim.Region;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
@ -354,23 +354,23 @@ namespace OpenSim
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
OpenSim.world.Avatar.PhysicsEngineFlying = false;
OpenSim.Region.Avatar.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
OpenSim.world.Avatar.PhysicsEngineFlying = false;
OpenSim.Region.Avatar.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
OpenSim.world.Avatar.PhysicsEngineFlying = true;
OpenSim.Region.Avatar.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
OpenSim.world.Avatar.PhysicsEngineFlying = true;
OpenSim.Region.Avatar.PhysicsEngineFlying = true;
break;
}
@ -456,7 +456,7 @@ namespace OpenSim
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
OpenSim.world.Avatar TempAv;
OpenSim.Region.Avatar TempAv;
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{

4
prebuild.xml
View File

@ -470,7 +470,7 @@
</Project>
<Project name="OpenSim.World" path="OpenSim/OpenSim.World" type="Library">
<Project name="OpenSim.Region" path="OpenSim/OpenSim.World" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@ -526,7 +526,7 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Physics.Manager"/>
<Reference name="OpenSim.Servers"/>
<Reference name="OpenSim.World"/>
<Reference name="OpenSim.Region"/>
<Reference name="OpenSim.RegionServer"/>
<Reference name="OpenSim.GenericConfig.Xml"/>
<Reference name="OpenGrid.Framework.Communications"/>