diff options
Diffstat (limited to '')
23 files changed, 51 insertions, 51 deletions
diff --git a/OpenSim.build b/OpenSim.build index a600918..b50f733 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -51,7 +51,7 @@ | |||
51 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> | 51 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> |
52 | <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> | 52 | <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> |
53 | <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" /> | 53 | <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" /> |
54 | <nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="clean" /> | 54 | <nant buildfile="OpenSim/OpenSim.World/OpenSim.Region.dll.build" target="clean" /> |
55 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" /> | 55 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" /> |
56 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> | 56 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> |
57 | <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> | 57 | <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> |
@@ -87,7 +87,7 @@ | |||
87 | <nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" /> | 87 | <nant buildfile="OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" /> |
88 | <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" /> | 88 | <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" /> |
89 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | 89 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> |
90 | <nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="build" /> | 90 | <nant buildfile="OpenSim/OpenSim.World/OpenSim.Region.dll.build" target="build" /> |
91 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" /> | 91 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" /> |
92 | </target> | 92 | </target> |
93 | 93 | ||
@@ -104,7 +104,7 @@ | |||
104 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> | 104 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> |
105 | <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> | 105 | <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> |
106 | <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" /> | 106 | <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" /> |
107 | <nant buildfile="OpenSim/OpenSim.World/OpenSim.World.dll.build" target="doc" /> | 107 | <nant buildfile="OpenSim/OpenSim.World/OpenSim.Region.dll.build" target="doc" /> |
108 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" /> | 108 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" /> |
109 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> | 109 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> |
110 | <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> | 110 | <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> |
diff --git a/OpenSim.sln b/OpenSim.sln index 5b54b05..ae35340 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual Studio 2005 | 2 | # Visual C# Express 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" | 5 | 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", | |||
10 | EndProject | 10 | EndProject |
11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" | 11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" |
12 | EndProject | 12 | EndProject |
13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.World", "OpenSim\OpenSim.World\OpenSim.World.csproj", "{642A14A8-0000-0000-0000-000000000000}" | 13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region", "OpenSim\OpenSim.World\OpenSim.Region.csproj", "{196916AF-0000-0000-0000-000000000000}" |
14 | EndProject | 14 | EndProject |
15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" |
16 | EndProject | 16 | EndProject |
@@ -66,10 +66,10 @@ Global | |||
66 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
67 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
68 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
69 | {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
70 | {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
71 | {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
72 | {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
73 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
74 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
75 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | {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 2338f27..c180b36 100644 --- a/OpenSim/OpenSim.World/Avatar.Client.cs +++ b/OpenSim/OpenSim.World/Avatar.Client.cs | |||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using libsecondlife.Packets; | 4 | using libsecondlife.Packets; |
5 | 5 | ||
6 | namespace OpenSim.world | 6 | namespace OpenSim.Region |
7 | { | 7 | { |
8 | partial class Avatar | 8 | partial class Avatar |
9 | { | 9 | { |
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs index c0d120a..2c28807 100644 --- a/OpenSim/OpenSim.World/Avatar.Update.cs +++ b/OpenSim/OpenSim.World/Avatar.Update.cs | |||
@@ -6,7 +6,7 @@ using libsecondlife.Packets; | |||
6 | using OpenSim.Physics.Manager; | 6 | using OpenSim.Physics.Manager; |
7 | using OpenSim.Framework.Interfaces; | 7 | using OpenSim.Framework.Interfaces; |
8 | 8 | ||
9 | namespace OpenSim.world | 9 | namespace OpenSim.Region |
10 | { | 10 | { |
11 | partial class Avatar | 11 | partial class Avatar |
12 | { | 12 | { |
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index 77e0300..88a7969 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs | |||
@@ -10,7 +10,7 @@ using OpenSim.Framework.Interfaces; | |||
10 | using OpenSim.Framework.Types; | 10 | using OpenSim.Framework.Types; |
11 | using Axiom.MathLib; | 11 | using Axiom.MathLib; |
12 | 12 | ||
13 | namespace OpenSim.world | 13 | namespace OpenSim.Region |
14 | { | 14 | { |
15 | public partial class Avatar : Entity | 15 | public partial class Avatar : Entity |
16 | { | 16 | { |
diff --git a/OpenSim/OpenSim.World/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs index f13646d..585cf3c 100644 --- a/OpenSim/OpenSim.World/AvatarAnimations.cs +++ b/OpenSim/OpenSim.World/AvatarAnimations.cs | |||
@@ -31,7 +31,7 @@ using System.Text; | |||
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | 33 | ||
34 | namespace OpenSim | 34 | namespace OpenSim.Region |
35 | { | 35 | { |
36 | public class AvatarAnimations | 36 | public class AvatarAnimations |
37 | { | 37 | { |
@@ -64,7 +64,7 @@ namespace OpenSim | |||
64 | 64 | ||
65 | // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); | 65 | // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); |
66 | 66 | ||
67 | foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID) | 67 | foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID) |
68 | { | 68 | { |
69 | AnimsNames.Add(kp.Value, kp.Key); | 69 | AnimsNames.Add(kp.Value, kp.Key); |
70 | } | 70 | } |
diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs index dd5f9a6..60bcd83 100644 --- a/OpenSim/OpenSim.World/Entity.cs +++ b/OpenSim/OpenSim.World/Entity.cs | |||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using Axiom.MathLib; | 4 | using Axiom.MathLib; |
5 | using OpenSim.Physics.Manager; | 5 | using OpenSim.Physics.Manager; |
6 | using OpenSim.types; | 6 | using OpenSim.Region.types; |
7 | using libsecondlife; | 7 | using libsecondlife; |
8 | using OpenSim.RegionServer.world.scripting; | 8 | using OpenSim.RegionServer.world.scripting; |
9 | 9 | ||
10 | namespace OpenSim.world | 10 | namespace OpenSim.Region |
11 | { | 11 | { |
12 | public abstract class Entity : IScriptReadonlyEntity | 12 | public abstract class Entity : IScriptReadonlyEntity |
13 | { | 13 | { |
diff --git a/OpenSim/OpenSim.World/Estate/EstateManager.cs b/OpenSim/OpenSim.World/Estate/EstateManager.cs index c94587a..f136d44 100644 --- a/OpenSim/OpenSim.World/Estate/EstateManager.cs +++ b/OpenSim/OpenSim.World/Estate/EstateManager.cs | |||
@@ -4,13 +4,13 @@ using System.Text; | |||
4 | 4 | ||
5 | using OpenSim.Framework.Types; | 5 | using OpenSim.Framework.Types; |
6 | using OpenSim.Framework.Interfaces; | 6 | using OpenSim.Framework.Interfaces; |
7 | using OpenSim.world; | 7 | using OpenSim.Region; |
8 | using OpenSim; | 8 | using OpenSim; |
9 | 9 | ||
10 | using libsecondlife; | 10 | using libsecondlife; |
11 | using libsecondlife.Packets; | 11 | using libsecondlife.Packets; |
12 | 12 | ||
13 | namespace OpenSim.world.Estate | 13 | namespace OpenSim.Region.Estate |
14 | { | 14 | { |
15 | 15 | ||
16 | /// <summary> | 16 | /// <summary> |
diff --git a/OpenSim/OpenSim.World/ParcelManager.cs b/OpenSim/OpenSim.World/ParcelManager.cs index db6909d..37dd24f 100644 --- a/OpenSim/OpenSim.World/ParcelManager.cs +++ b/OpenSim/OpenSim.World/ParcelManager.cs | |||
@@ -33,7 +33,7 @@ using libsecondlife.Packets; | |||
33 | using OpenSim.Framework.Interfaces; | 33 | using OpenSim.Framework.Interfaces; |
34 | using OpenSim.Framework.Types; | 34 | using OpenSim.Framework.Types; |
35 | 35 | ||
36 | namespace OpenSim.world | 36 | namespace OpenSim.Region |
37 | { | 37 | { |
38 | 38 | ||
39 | 39 | ||
@@ -418,7 +418,7 @@ namespace OpenSim.world | |||
418 | { | 418 | { |
419 | for (y = 0; y < inc_y; y++) | 419 | for (y = 0; y < inc_y; y++) |
420 | { | 420 | { |
421 | OpenSim.world.Parcel currentParcel = getParcel(start_x + x, start_y + y); | 421 | OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y); |
422 | if (!temp.Contains(currentParcel)) | 422 | if (!temp.Contains(currentParcel)) |
423 | { | 423 | { |
424 | currentParcel.forceUpdateParcelInfo(); | 424 | currentParcel.forceUpdateParcelInfo(); |
@@ -648,7 +648,7 @@ namespace OpenSim.world | |||
648 | sendParcelProperties(0, false, 0, avatars[i].ControllingClient); | 648 | sendParcelProperties(0, false, 0, avatars[i].ControllingClient); |
649 | } | 649 | } |
650 | } | 650 | } |
651 | 651 | ||
652 | } | 652 | } |
653 | } | 653 | } |
654 | #endregion | 654 | #endregion |
diff --git a/OpenSim/OpenSim.World/Primitive.cs b/OpenSim/OpenSim.World/Primitive.cs index 492341a..1b1894b 100644 --- a/OpenSim/OpenSim.World/Primitive.cs +++ b/OpenSim/OpenSim.World/Primitive.cs | |||
@@ -1,7 +1,7 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim.types; | 4 | using OpenSim.Region.types; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | using libsecondlife.Packets; | 6 | using libsecondlife.Packets; |
7 | using OpenSim.Framework.Interfaces; | 7 | using OpenSim.Framework.Interfaces; |
@@ -9,7 +9,7 @@ using OpenSim.Physics.Manager; | |||
9 | using OpenSim.Framework.Types; | 9 | using OpenSim.Framework.Types; |
10 | using OpenSim.Framework.Inventory; | 10 | using OpenSim.Framework.Inventory; |
11 | 11 | ||
12 | namespace OpenSim.world | 12 | namespace OpenSim.Region |
13 | { | 13 | { |
14 | public class Primitive : Entity | 14 | public class Primitive : Entity |
15 | { | 15 | { |
@@ -84,9 +84,9 @@ namespace OpenSim.world | |||
84 | dataArrays.Add(primData.ToBytes()); | 84 | dataArrays.Add(primData.ToBytes()); |
85 | foreach (Entity child in children) | 85 | foreach (Entity child in children) |
86 | { | 86 | { |
87 | if (child is OpenSim.world.Primitive) | 87 | if (child is OpenSim.Region.Primitive) |
88 | { | 88 | { |
89 | dataArrays.Add(((OpenSim.world.Primitive)child).GetByteArray()); | 89 | dataArrays.Add(((OpenSim.Region.Primitive)child).GetByteArray()); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | byte[] primstart = Helpers.StringToField("<Prim>"); | 92 | byte[] primstart = Helpers.StringToField("<Prim>"); |
diff --git a/OpenSim/OpenSim.World/SceneObject.cs b/OpenSim/OpenSim.World/SceneObject.cs index 9ed99ba..9ea631b 100644 --- a/OpenSim/OpenSim.World/SceneObject.cs +++ b/OpenSim/OpenSim.World/SceneObject.cs | |||
@@ -1,7 +1,7 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim.types; | 4 | using OpenSim.Region.types; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | using libsecondlife.Packets; | 6 | using libsecondlife.Packets; |
7 | using OpenSim.Framework.Interfaces; | 7 | using OpenSim.Framework.Interfaces; |
@@ -9,7 +9,7 @@ using OpenSim.Physics.Manager; | |||
9 | using OpenSim.Framework.Types; | 9 | using OpenSim.Framework.Types; |
10 | using OpenSim.Framework.Inventory; | 10 | using OpenSim.Framework.Inventory; |
11 | 11 | ||
12 | namespace OpenSim.world | 12 | namespace OpenSim.Region |
13 | { | 13 | { |
14 | public class SceneObject : Entity | 14 | public class SceneObject : Entity |
15 | { | 15 | { |
diff --git a/OpenSim/OpenSim.World/World.PacketHandlers.cs b/OpenSim/OpenSim.World/World.PacketHandlers.cs index dd340d7..c88e920 100644 --- a/OpenSim/OpenSim.World/World.PacketHandlers.cs +++ b/OpenSim/OpenSim.World/World.PacketHandlers.cs | |||
@@ -9,7 +9,7 @@ using OpenSim.Framework.Types; | |||
9 | using OpenSim.Framework.Inventory; | 9 | using OpenSim.Framework.Inventory; |
10 | using OpenSim.Framework.Utilities; | 10 | using OpenSim.Framework.Utilities; |
11 | 11 | ||
12 | namespace OpenSim.world | 12 | namespace OpenSim.Region |
13 | { | 13 | { |
14 | public partial class World | 14 | public partial class World |
15 | { | 15 | { |
diff --git a/OpenSim/OpenSim.World/World.Scripting.cs b/OpenSim/OpenSim.World/World.Scripting.cs index 048a97f..49a0fce 100644 --- a/OpenSim/OpenSim.World/World.Scripting.cs +++ b/OpenSim/OpenSim.World/World.Scripting.cs | |||
@@ -8,7 +8,7 @@ using OpenSim.Framework.Interfaces; | |||
8 | using OpenSim.Framework.Types; | 8 | using OpenSim.Framework.Types; |
9 | using libsecondlife; | 9 | using libsecondlife; |
10 | 10 | ||
11 | namespace OpenSim.world | 11 | namespace OpenSim.Region |
12 | { | 12 | { |
13 | public partial class World | 13 | public partial class World |
14 | { | 14 | { |
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index cc2b04e..6932782 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs | |||
@@ -15,10 +15,10 @@ using OpenSim.Framework; | |||
15 | using OpenSim.RegionServer.world.scripting; | 15 | using OpenSim.RegionServer.world.scripting; |
16 | using OpenSim.Terrain; | 16 | using OpenSim.Terrain; |
17 | using OpenGrid.Framework.Communications; | 17 | using OpenGrid.Framework.Communications; |
18 | using OpenSim.world.Estate; | 18 | using OpenSim.Region.Estate; |
19 | 19 | ||
20 | 20 | ||
21 | namespace OpenSim.world | 21 | namespace OpenSim.Region |
22 | { | 22 | { |
23 | public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI | 23 | public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI |
24 | { | 24 | { |
@@ -218,7 +218,7 @@ namespace OpenSim.world | |||
218 | //Parcel backup routines | 218 | //Parcel backup routines |
219 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; | 219 | ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; |
220 | int i = 0; | 220 | int i = 0; |
221 | foreach (OpenSim.world.Parcel parcel in parcelManager.parcelList.Values) | 221 | foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values) |
222 | { | 222 | { |
223 | parcels[i] = parcel.parcelData; | 223 | parcels[i] = parcel.parcelData; |
224 | i++; | 224 | i++; |
diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs index 92bc6a3..9fa4453 100644 --- a/OpenSim/OpenSim.World/WorldBase.cs +++ b/OpenSim/OpenSim.World/WorldBase.cs | |||
@@ -13,7 +13,7 @@ using OpenSim.Framework.Inventory; | |||
13 | using OpenSim.RegionServer.world.scripting; | 13 | using OpenSim.RegionServer.world.scripting; |
14 | using OpenSim.Terrain; | 14 | using OpenSim.Terrain; |
15 | 15 | ||
16 | namespace OpenSim.world | 16 | namespace OpenSim.Region |
17 | { | 17 | { |
18 | public abstract class WorldBase : IWorld | 18 | public abstract class WorldBase : IWorld |
19 | { | 19 | { |
diff --git a/OpenSim/OpenSim.World/scripting/IScriptHandler.cs b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs index efd67b1..06d92a6 100644 --- a/OpenSim/OpenSim.World/scripting/IScriptHandler.cs +++ b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs | |||
@@ -3,9 +3,9 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | using OpenSim.Physics.Manager; | 5 | using OpenSim.Physics.Manager; |
6 | using OpenSim.world; | 6 | using OpenSim.Region; |
7 | using Avatar=OpenSim.world.Avatar; | 7 | using Avatar=OpenSim.Region.Avatar; |
8 | using Primitive = OpenSim.world.Primitive; | 8 | using Primitive = OpenSim.Region.Primitive; |
9 | 9 | ||
10 | namespace OpenSim.RegionServer.world.scripting | 10 | namespace OpenSim.RegionServer.world.scripting |
11 | { | 11 | { |
diff --git a/OpenSim/OpenSim.World/types/Mesh.cs b/OpenSim/OpenSim.World/types/Mesh.cs index ff0cc65..ccc55eb 100644 --- a/OpenSim/OpenSim.World/types/Mesh.cs +++ b/OpenSim/OpenSim.World/types/Mesh.cs | |||
@@ -2,7 +2,7 @@ using System; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | 4 | ||
5 | namespace OpenSim.types | 5 | namespace OpenSim.Region.types |
6 | { | 6 | { |
7 | // TODO: This will need some performance tuning no doubt. | 7 | // TODO: This will need some performance tuning no doubt. |
8 | public class Mesh | 8 | public class Mesh |
diff --git a/OpenSim/OpenSim.World/types/Triangle.cs b/OpenSim/OpenSim.World/types/Triangle.cs index 07c0a91..488cc21 100644 --- a/OpenSim/OpenSim.World/types/Triangle.cs +++ b/OpenSim/OpenSim.World/types/Triangle.cs | |||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using Axiom.MathLib; | 4 | using Axiom.MathLib; |
5 | 5 | ||
6 | namespace OpenSim.types | 6 | namespace OpenSim.Region.types |
7 | { | 7 | { |
8 | public class Triangle | 8 | public class Triangle |
9 | { | 9 | { |
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs index 3f9c0ec..57a7acb 100644 --- a/OpenSim/OpenSim/Application.cs +++ b/OpenSim/OpenSim/Application.cs | |||
@@ -82,7 +82,7 @@ namespace OpenSim | |||
82 | sim.m_sandbox = sandBoxMode; | 82 | sim.m_sandbox = sandBoxMode; |
83 | sim.user_accounts = userAccounts; | 83 | sim.user_accounts = userAccounts; |
84 | sim.gridLocalAsset = gridLocalAsset; | 84 | sim.gridLocalAsset = gridLocalAsset; |
85 | OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; | 85 | OpenSim.Region.Avatar.PhysicsEngineFlying = allowFlying; |
86 | 86 | ||
87 | sim.StartUp(); | 87 | sim.StartUp(); |
88 | 88 | ||
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj index 0033d6b..b5897aa 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim/OpenSim.csproj | |||
@@ -110,9 +110,9 @@ | |||
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
111 | <Private>False</Private> | 111 | <Private>False</Private> |
112 | </ProjectReference> | 112 | </ProjectReference> |
113 | <ProjectReference Include="..\OpenSim.World\OpenSim.World.csproj"> | 113 | <ProjectReference Include="..\OpenSim.World\OpenSim.Region.csproj"> |
114 | <Name>OpenSim.World</Name> | 114 | <Name>OpenSim.Region</Name> |
115 | <Project>{642A14A8-0000-0000-0000-000000000000}</Project> | 115 | <Project>{196916AF-0000-0000-0000-000000000000}</Project> |
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
117 | <Private>False</Private> | 117 | <Private>False</Private> |
118 | </ProjectReference> | 118 | </ProjectReference> |
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 9c209ac..6038583 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build | |||
@@ -29,7 +29,7 @@ | |||
29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
30 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 30 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
31 | <include name="../../bin/OpenSim.Servers.dll" /> | 31 | <include name="../../bin/OpenSim.Servers.dll" /> |
32 | <include name="../../bin/OpenSim.World.dll" /> | 32 | <include name="../../bin/OpenSim.Region.dll" /> |
33 | <include name="../../bin/OpenSim.RegionServer.dll" /> | 33 | <include name="../../bin/OpenSim.RegionServer.dll" /> |
34 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | 34 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> |
35 | <include name="../../bin/OpenGrid.Framework.Communications.dll" /> | 35 | <include name="../../bin/OpenGrid.Framework.Communications.dll" /> |
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index a90e14b..e1f6281 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs | |||
@@ -38,7 +38,7 @@ using System.Collections; | |||
38 | using System.Collections.Generic; | 38 | using System.Collections.Generic; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using libsecondlife.Packets; | 40 | using libsecondlife.Packets; |
41 | using OpenSim.world; | 41 | using OpenSim.Region; |
42 | using OpenSim.Terrain; | 42 | using OpenSim.Terrain; |
43 | using OpenSim.Framework.Interfaces; | 43 | using OpenSim.Framework.Interfaces; |
44 | using OpenSim.Framework.Types; | 44 | using OpenSim.Framework.Types; |
@@ -354,23 +354,23 @@ namespace OpenSim | |||
354 | case "": | 354 | case "": |
355 | this.m_physicsEngine = "basicphysics"; | 355 | this.m_physicsEngine = "basicphysics"; |
356 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 356 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
357 | OpenSim.world.Avatar.PhysicsEngineFlying = false; | 357 | OpenSim.Region.Avatar.PhysicsEngineFlying = false; |
358 | break; | 358 | break; |
359 | 359 | ||
360 | case "basicphysics": | 360 | case "basicphysics": |
361 | this.m_physicsEngine = "basicphysics"; | 361 | this.m_physicsEngine = "basicphysics"; |
362 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 362 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
363 | OpenSim.world.Avatar.PhysicsEngineFlying = false; | 363 | OpenSim.Region.Avatar.PhysicsEngineFlying = false; |
364 | break; | 364 | break; |
365 | 365 | ||
366 | case "RealPhysX": | 366 | case "RealPhysX": |
367 | this.m_physicsEngine = "RealPhysX"; | 367 | this.m_physicsEngine = "RealPhysX"; |
368 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | 368 | OpenSim.Region.Avatar.PhysicsEngineFlying = true; |
369 | break; | 369 | break; |
370 | 370 | ||
371 | case "OpenDynamicsEngine": | 371 | case "OpenDynamicsEngine": |
372 | this.m_physicsEngine = "OpenDynamicsEngine"; | 372 | this.m_physicsEngine = "OpenDynamicsEngine"; |
373 | OpenSim.world.Avatar.PhysicsEngineFlying = true; | 373 | OpenSim.Region.Avatar.PhysicsEngineFlying = true; |
374 | break; | 374 | break; |
375 | } | 375 | } |
376 | 376 | ||
@@ -456,7 +456,7 @@ namespace OpenSim | |||
456 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString()); | 456 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString()); |
457 | break; | 457 | break; |
458 | case "users": | 458 | case "users": |
459 | OpenSim.world.Avatar TempAv; | 459 | OpenSim.Region.Avatar TempAv; |
460 | 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")); | 460 | 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")); |
461 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) | 461 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) |
462 | { | 462 | { |
diff --git a/prebuild.xml b/prebuild.xml index 6d64b23..62e1229 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -470,7 +470,7 @@ | |||
470 | </Project> | 470 | </Project> |
471 | 471 | ||
472 | 472 | ||
473 | <Project name="OpenSim.World" path="OpenSim/OpenSim.World" type="Library"> | 473 | <Project name="OpenSim.Region" path="OpenSim/OpenSim.World" type="Library"> |
474 | <Configuration name="Debug"> | 474 | <Configuration name="Debug"> |
475 | <Options> | 475 | <Options> |
476 | <OutputPath>../../bin/</OutputPath> | 476 | <OutputPath>../../bin/</OutputPath> |
@@ -526,7 +526,7 @@ | |||
526 | <Reference name="OpenSim.Framework.Console"/> | 526 | <Reference name="OpenSim.Framework.Console"/> |
527 | <Reference name="OpenSim.Physics.Manager"/> | 527 | <Reference name="OpenSim.Physics.Manager"/> |
528 | <Reference name="OpenSim.Servers"/> | 528 | <Reference name="OpenSim.Servers"/> |
529 | <Reference name="OpenSim.World"/> | 529 | <Reference name="OpenSim.Region"/> |
530 | <Reference name="OpenSim.RegionServer"/> | 530 | <Reference name="OpenSim.RegionServer"/> |
531 | <Reference name="OpenSim.GenericConfig.Xml"/> | 531 | <Reference name="OpenSim.GenericConfig.Xml"/> |
532 | <Reference name="OpenGrid.Framework.Communications"/> | 532 | <Reference name="OpenGrid.Framework.Communications"/> |