diff options
Diffstat (limited to '')
-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.csproj | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/OpenSim.Region.dll.build | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Scene/Scene.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.API.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs) | 0 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs) | 0 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs) | 0 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs) | 0 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs) | 0 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientViewBase.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs) | 0 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | 28 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 12 |
12 files changed, 24 insertions, 25 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; | |||
37 | using libsecondlife; | 37 | using libsecondlife; |
38 | using libsecondlife.Packets; | 38 | using libsecondlife.Packets; |
39 | 39 | ||
40 | namespace OpenSim.Region.Estate | 40 | namespace 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; | |||
42 | using OpenSim.Region.Scripting; | 42 | using OpenSim.Region.Scripting; |
43 | using OpenSim.Terrain; | 43 | using OpenSim.Terrain; |
44 | using OpenGrid.Framework.Communications; | 44 | using OpenGrid.Framework.Communications; |
45 | using OpenSim.Region.Estate; | ||
46 | 45 | ||
47 | 46 | ||
48 | namespace OpenSim.Region | 47 | namespace OpenSim.Region |
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index b9773c6..b9773c6 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs index 31749d8..31749d8 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.AgentAssetUpload.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs index 035eb4c..035eb4c 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs index c6749a1..c6749a1 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index e9c1f2d..e9c1f2d 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs index facb3fa..facb3fa 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView/ClientViewBase.cs +++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs | |||
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index c71e60c..5c726bd 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -130,46 +130,46 @@ | |||
130 | </ProjectReference> | 130 | </ProjectReference> |
131 | </ItemGroup> | 131 | </ItemGroup> |
132 | <ItemGroup> | 132 | <ItemGroup> |
133 | <Compile Include="NetworkServersInfo.cs"> | 133 | <Compile Include="ClientView.AgentAssetUpload.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="OpenSimNetworkHandler.cs"> | 136 | <Compile Include="ClientView.API.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="PacketServer.cs"> | 139 | <Compile Include="ClientView.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
142 | <Compile Include="RegionServerBase.cs"> | 142 | <Compile Include="ClientView.PacketHandlers.cs"> |
143 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
144 | </Compile> | 144 | </Compile> |
145 | <Compile Include="UDPServer.cs"> | 145 | <Compile Include="ClientView.ProcessPackets.cs"> |
146 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
147 | </Compile> | 147 | </Compile> |
148 | <Compile Include="UserConfigUtility.cs"> | 148 | <Compile Include="ClientViewBase.cs"> |
149 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
150 | </Compile> | 150 | </Compile> |
151 | <Compile Include="VersionInfo.cs"> | 151 | <Compile Include="NetworkServersInfo.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
154 | <Compile Include="Assets\InventoryCache.cs"> | 154 | <Compile Include="OpenSimNetworkHandler.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="ClientView\ClientView.AgentAssetUpload.cs"> | 157 | <Compile Include="PacketServer.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="ClientView\ClientView.API.cs"> | 160 | <Compile Include="RegionServerBase.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="ClientView\ClientView.cs"> | 163 | <Compile Include="UDPServer.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="ClientView\ClientView.PacketHandlers.cs"> | 166 | <Compile Include="UserConfigUtility.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="ClientView\ClientView.ProcessPackets.cs"> | 169 | <Compile Include="VersionInfo.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="ClientView\ClientViewBase.cs"> | 172 | <Compile Include="Assets\InventoryCache.cs"> |
173 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
174 | </Compile> | 174 | </Compile> |
175 | </ItemGroup> | 175 | </ItemGroup> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 10e3422..87c5b22 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -11,6 +11,12 @@ | |||
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ClientView.AgentAssetUpload.cs" /> | ||
15 | <include name="ClientView.API.cs" /> | ||
16 | <include name="ClientView.cs" /> | ||
17 | <include name="ClientView.PacketHandlers.cs" /> | ||
18 | <include name="ClientView.ProcessPackets.cs" /> | ||
19 | <include name="ClientViewBase.cs" /> | ||
14 | <include name="NetworkServersInfo.cs" /> | 20 | <include name="NetworkServersInfo.cs" /> |
15 | <include name="OpenSimNetworkHandler.cs" /> | 21 | <include name="OpenSimNetworkHandler.cs" /> |
16 | <include name="PacketServer.cs" /> | 22 | <include name="PacketServer.cs" /> |
@@ -19,12 +25,6 @@ | |||
19 | <include name="UserConfigUtility.cs" /> | 25 | <include name="UserConfigUtility.cs" /> |
20 | <include name="VersionInfo.cs" /> | 26 | <include name="VersionInfo.cs" /> |
21 | <include name="Assets/InventoryCache.cs" /> | 27 | <include name="Assets/InventoryCache.cs" /> |
22 | <include name="ClientView/ClientView.AgentAssetUpload.cs" /> | ||
23 | <include name="ClientView/ClientView.API.cs" /> | ||
24 | <include name="ClientView/ClientView.cs" /> | ||
25 | <include name="ClientView/ClientView.PacketHandlers.cs" /> | ||
26 | <include name="ClientView/ClientView.ProcessPackets.cs" /> | ||
27 | <include name="ClientView/ClientViewBase.cs" /> | ||
28 | </sources> | 28 | </sources> |
29 | <references basedir="${project::get-base-directory()}"> | 29 | <references basedir="${project::get-base-directory()}"> |
30 | <lib> | 30 | <lib> |