diff --git a/OpenSim.build b/OpenSim.build index a600918c08..b50f733d21 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -51,7 +51,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/OpenSim.sln b/OpenSim.sln index 5b54b056c3..ae353409a6 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -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 diff --git a/OpenSim/OpenSim.World/Avatar.Client.cs b/OpenSim/OpenSim.World/Avatar.Client.cs index 2338f27664..c180b36e0d 100644 --- a/OpenSim/OpenSim.World/Avatar.Client.cs +++ b/OpenSim/OpenSim.World/Avatar.Client.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using libsecondlife.Packets; -namespace OpenSim.world +namespace OpenSim.Region { partial class Avatar { diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs index c0d120aefd..2c28807cf8 100644 --- a/OpenSim/OpenSim.World/Avatar.Update.cs +++ b/OpenSim/OpenSim.World/Avatar.Update.cs @@ -6,7 +6,7 @@ using libsecondlife.Packets; using OpenSim.Physics.Manager; using OpenSim.Framework.Interfaces; -namespace OpenSim.world +namespace OpenSim.Region { partial class Avatar { diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index 77e0300b73..88a7969735 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs @@ -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 { diff --git a/OpenSim/OpenSim.World/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs index f13646d4da..585cf3cfa5 100644 --- a/OpenSim/OpenSim.World/AvatarAnimations.cs +++ b/OpenSim/OpenSim.World/AvatarAnimations.cs @@ -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 kp in OpenSim.world.Avatar.Animations.AnimsLLUUID) + foreach (KeyValuePair kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID) { AnimsNames.Add(kp.Value, kp.Key); } diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs index dd5f9a6646..60bcd83cab 100644 --- a/OpenSim/OpenSim.World/Entity.cs +++ b/OpenSim/OpenSim.World/Entity.cs @@ -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 { diff --git a/OpenSim/OpenSim.World/Estate/EstateManager.cs b/OpenSim/OpenSim.World/Estate/EstateManager.cs index c94587aa4b..f136d44066 100644 --- a/OpenSim/OpenSim.World/Estate/EstateManager.cs +++ b/OpenSim/OpenSim.World/Estate/EstateManager.cs @@ -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 { /// diff --git a/OpenSim/OpenSim.World/ParcelManager.cs b/OpenSim/OpenSim.World/ParcelManager.cs index db6909db28..37dd24ff54 100644 --- a/OpenSim/OpenSim.World/ParcelManager.cs +++ b/OpenSim/OpenSim.World/ParcelManager.cs @@ -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 diff --git a/OpenSim/OpenSim.World/Primitive.cs b/OpenSim/OpenSim.World/Primitive.cs index 492341a799..1b1894bc83 100644 --- a/OpenSim/OpenSim.World/Primitive.cs +++ b/OpenSim/OpenSim.World/Primitive.cs @@ -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(""); diff --git a/OpenSim/OpenSim.World/SceneObject.cs b/OpenSim/OpenSim.World/SceneObject.cs index 9ed99ba833..9ea631b5eb 100644 --- a/OpenSim/OpenSim.World/SceneObject.cs +++ b/OpenSim/OpenSim.World/SceneObject.cs @@ -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 { diff --git a/OpenSim/OpenSim.World/World.PacketHandlers.cs b/OpenSim/OpenSim.World/World.PacketHandlers.cs index dd340d7be6..c88e920929 100644 --- a/OpenSim/OpenSim.World/World.PacketHandlers.cs +++ b/OpenSim/OpenSim.World/World.PacketHandlers.cs @@ -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 { diff --git a/OpenSim/OpenSim.World/World.Scripting.cs b/OpenSim/OpenSim.World/World.Scripting.cs index 048a97fa4e..49a0fceb3b 100644 --- a/OpenSim/OpenSim.World/World.Scripting.cs +++ b/OpenSim/OpenSim.World/World.Scripting.cs @@ -8,7 +8,7 @@ using OpenSim.Framework.Interfaces; using OpenSim.Framework.Types; using libsecondlife; -namespace OpenSim.world +namespace OpenSim.Region { public partial class World { diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index cc2b04e233..69327828b9 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs @@ -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++; diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs index 92bc6a3cda..9fa4453522 100644 --- a/OpenSim/OpenSim.World/WorldBase.cs +++ b/OpenSim/OpenSim.World/WorldBase.cs @@ -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 { diff --git a/OpenSim/OpenSim.World/scripting/IScriptHandler.cs b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs index efd67b1141..06d92a625f 100644 --- a/OpenSim/OpenSim.World/scripting/IScriptHandler.cs +++ b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs @@ -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 { diff --git a/OpenSim/OpenSim.World/types/Mesh.cs b/OpenSim/OpenSim.World/types/Mesh.cs index ff0cc65292..ccc55ebb86 100644 --- a/OpenSim/OpenSim.World/types/Mesh.cs +++ b/OpenSim/OpenSim.World/types/Mesh.cs @@ -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 diff --git a/OpenSim/OpenSim.World/types/Triangle.cs b/OpenSim/OpenSim.World/types/Triangle.cs index 07c0a91144..488cc21a4a 100644 --- a/OpenSim/OpenSim.World/types/Triangle.cs +++ b/OpenSim/OpenSim.World/types/Triangle.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Axiom.MathLib; -namespace OpenSim.types +namespace OpenSim.Region.types { public class Triangle { diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs index 3f9c0ec059..57a7acbc46 100644 --- a/OpenSim/OpenSim/Application.cs +++ b/OpenSim/OpenSim/Application.cs @@ -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(); diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj index 0033d6b879..b5897aa4d4 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim/OpenSim.csproj @@ -110,9 +110,9 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False - - OpenSim.World - {642A14A8-0000-0000-0000-000000000000} + + OpenSim.Region + {196916AF-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 9c209ac4ec..6038583831 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build @@ -29,7 +29,7 @@ - + diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index a90e14b3f4..e1f62812c4 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs @@ -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) { diff --git a/prebuild.xml b/prebuild.xml index 6d64b23375..62e1229e05 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -470,7 +470,7 @@ - + ../../bin/ @@ -526,7 +526,7 @@ - +