aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.Region')
-rw-r--r--OpenSim/OpenSim.Region/EstateManager.cs (renamed from OpenSim/OpenSim.Region/Estate/EstateManager.cs)2
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj4
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build2
-rw-r--r--OpenSim/OpenSim.Region/Scene/Scene.cs1
4 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.Region/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/EstateManager.cs
index 875defd..88b2dac 100644
--- a/OpenSim/OpenSim.Region/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/EstateManager.cs
@@ -37,7 +37,7 @@ using OpenSim;
37using libsecondlife; 37using libsecondlife;
38using libsecondlife.Packets; 38using libsecondlife.Packets;
39 39
40namespace OpenSim.Region.Estate 40namespace OpenSim.Region
41{ 41{
42 42
43 /// <summary> 43 /// <summary>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index ff916d1..03c7c7d 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -130,10 +130,10 @@
130 </ProjectReference> 130 </ProjectReference>
131 </ItemGroup> 131 </ItemGroup>
132 <ItemGroup> 132 <ItemGroup>
133 <Compile Include="ParcelManager.cs"> 133 <Compile Include="EstateManager.cs">
134 <SubType>Code</SubType> 134 <SubType>Code</SubType>
135 </Compile> 135 </Compile>
136 <Compile Include="Estate\EstateManager.cs"> 136 <Compile Include="ParcelManager.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="Scene\Scene.cs"> 139 <Compile Include="Scene\Scene.cs">
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index a49c08f..6ddf462 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenSim.Region" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="EstateManager.cs" />
14 <include name="ParcelManager.cs" /> 15 <include name="ParcelManager.cs" />
15 <include name="Estate/EstateManager.cs" />
16 <include name="Scene/Scene.cs" /> 16 <include name="Scene/Scene.cs" />
17 <include name="Scene/Scene.PacketHandlers.cs" /> 17 <include name="Scene/Scene.PacketHandlers.cs" />
18 <include name="Scene/Scene.Scripting.cs" /> 18 <include name="Scene/Scene.Scripting.cs" />
diff --git a/OpenSim/OpenSim.Region/Scene/Scene.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index e3ffca4..6b27f8f 100644
--- a/OpenSim/OpenSim.Region/Scene/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -42,7 +42,6 @@ using OpenSim.Framework;
42using OpenSim.Region.Scripting; 42using OpenSim.Region.Scripting;
43using OpenSim.Terrain; 43using OpenSim.Terrain;
44using OpenGrid.Framework.Communications; 44using OpenGrid.Framework.Communications;
45using OpenSim.Region.Estate;
46 45
47 46
48namespace OpenSim.Region 47namespace OpenSim.Region