aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Assets/InventoryCache.cs (renamed from OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs)1
-rw-r--r--OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs (renamed from OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs)2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView.API.cs)5
-rw-r--r--OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs)4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs)4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs)10
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs (renamed from OpenSim/OpenSim.RegionServer/ClientView.cs)4
-rw-r--r--OpenSim/Region/ClientStack/ClientViewBase.cs (renamed from OpenSim/OpenSim.RegionServer/ClientViewBase.cs)2
-rw-r--r--OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj (renamed from OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj)69
-rw-r--r--OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build (renamed from OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build)33
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs (renamed from OpenSim/OpenSim.RegionServer/PacketServer.cs)4
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs (renamed from OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs)9
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs (renamed from OpenSim/OpenSim.RegionServer/UDPServer.cs)9
13 files changed, 70 insertions, 86 deletions
diff --git a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c..da74f85 100644
--- a/OpenSim/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
35using OpenSim.Framework.Inventory; 35using OpenSim.Framework.Inventory;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Interfaces; 37using OpenSim.Framework.Interfaces;
38using OpenSim.Region.ClientStack;
38 39
39namespace OpenSim.Assets 40namespace OpenSim.Assets
40{ 41{
diff --git a/OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 7552195..f99cf79 100644
--- a/OpenSim/OpenSim.RegionServer/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
33using libsecondlife; 33using libsecondlife;
34 34
35 35
36namespace OpenSim 36namespace OpenSim.Region.ClientStack
37{ 37{
38 38
39 public interface ClientStackNetworkHandler 39 public interface ClientStackNetworkHandler
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c7..9650b42 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
35using libsecondlife; 35using libsecondlife;
36using libsecondlife.Packets; 36using libsecondlife.Packets;
37 37
38namespace OpenSim 38namespace OpenSim.Region.ClientStack
39{ 39{
40 partial class ClientView 40 partial class ClientView
41 { 41 {
@@ -68,6 +68,8 @@ namespace OpenSim
68 public event GenericCall6 OnRemoveAvatar; 68 public event GenericCall6 OnRemoveAvatar;
69 public event RequestMapBlocks OnRequestMapBlocks; 69 public event RequestMapBlocks OnRequestMapBlocks;
70 public event TeleportLocationRequest OnTeleportLocationRequest; 70 public event TeleportLocationRequest OnTeleportLocationRequest;
71
72 public event UUIDNameRequest OnNameFromUUIDRequest;
71 73
72 public event ParcelPropertiesRequest OnParcelPropertiesRequest; 74 public event ParcelPropertiesRequest OnParcelPropertiesRequest;
73 public event ParcelDivideRequest OnParcelDivideRequest; 75 public event ParcelDivideRequest OnParcelDivideRequest;
@@ -75,7 +77,6 @@ namespace OpenSim
75 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; 77 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
76 78
77 public event EstateOwnerMessageRequest OnEstateOwnerMessage; 79 public event EstateOwnerMessageRequest OnEstateOwnerMessage;
78
79 /// <summary> 80 /// <summary>
80 /// 81 ///
81 /// </summary> 82 /// </summary>
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a..bc6cc21 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
32using OpenSim.Framework.Types; 32using OpenSim.Framework.Types;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Utilities; 34using OpenSim.Framework.Utilities;
35using OpenSim.Caches; 35using OpenSim.Region.Caches;
36using libsecondlife; 36using libsecondlife;
37using libsecondlife.Packets; 37using libsecondlife.Packets;
38 38
39namespace OpenSim 39namespace OpenSim.Region.ClientStack
40{ 40{
41 partial class ClientView 41 partial class ClientView
42 { 42 {
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed02..0456e3c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.Assets; 43using OpenSim.Assets;
44 44
45namespace OpenSim 45namespace OpenSim.Region.ClientStack
46{ 46{
47 public partial class ClientView 47 public partial class ClientView
48 { 48 {
@@ -192,7 +192,5 @@ namespace OpenSim
192 this.OutPacket(mbReply); 192 this.OutPacket(mbReply);
193 */ 193 */
194 } 194 }
195
196
197 } 195 }
198} 196}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef21..794ce79 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.Assets; 43using OpenSim.Assets;
44 44
45namespace OpenSim 45namespace OpenSim.Region.ClientStack
46{ 46{
47 public partial class ClientView 47 public partial class ClientView
48 { 48 {
@@ -492,7 +492,13 @@ namespace OpenSim
492 case PacketType.MoneyBalanceRequest: 492 case PacketType.MoneyBalanceRequest:
493 this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000); 493 this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
494 break; 494 break;
495 495 case PacketType.UUIDNameRequest:
496 UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
497 foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
498 {
499 OnNameFromUUIDRequest(UUIDBlock.ID, this);
500 }
501 break;
496 #region Parcel related packets 502 #region Parcel related packets
497 case PacketType.ParcelPropertiesRequest: 503 case PacketType.ParcelPropertiesRequest:
498 ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; 504 ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 312da9d..9c4462d 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
42using OpenSim.Framework.Inventory; 42using OpenSim.Framework.Inventory;
43using OpenSim.Framework.Utilities; 43using OpenSim.Framework.Utilities;
44using OpenSim.Assets; 44using OpenSim.Assets;
45using OpenSim.Caches; 45using OpenSim.Region.Caches;
46 46
47namespace OpenSim 47namespace OpenSim.Region.ClientStack
48{ 48{
49 public delegate bool PacketMethod(ClientView simClient, Packet packet); 49 public delegate bool PacketMethod(ClientView simClient, Packet packet);
50 50
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0..7d39405 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
39using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
40using OpenSim.Framework.Interfaces; 40using OpenSim.Framework.Interfaces;
41 41
42namespace OpenSim 42namespace OpenSim.Region.ClientStack
43{ 43{
44 public class ClientViewBase 44 public class ClientViewBase
45 { 45 {
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index b1ce3eb..3093eb0 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -3,20 +3,20 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{DC3698B2-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.RegionServer</AssemblyName> 12 <AssemblyName>OpenSim.Region.ClientStack</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript> 13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> 14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim.RegionServer</RootNamespace> 19 <RootNamespace>OpenSim.Region.ClientStack</RootNamespace>
20 <StartupObject></StartupObject> 20 <StartupObject></StartupObject>
21 <FileUpgradeFlags> 21 <FileUpgradeFlags>
22 </FileUpgradeFlags> 22 </FileUpgradeFlags>
@@ -32,7 +32,7 @@
32 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
35 <OutputPath>..\..\bin\</OutputPath> 35 <OutputPath>..\..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop> 36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>..\..\bin\</OutputPath> 53 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,15 +59,15 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="Axiom.MathLib.dll" > 61 <Reference Include="Axiom.MathLib.dll" >
62 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> 62 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="Db4objects.Db4o.dll" > 65 <Reference Include="Db4objects.Db4o.dll" >
66 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 66 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="libsecondlife.dll" > 69 <Reference Include="libsecondlife.dll" >
70 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 71 <Private>False</Private>
72 </Reference> 72 </Reference>
73 <Reference Include="System" > 73 <Reference Include="System" >
@@ -78,59 +78,45 @@
78 <HintPath>System.Xml.dll</HintPath> 78 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 79 <Private>False</Private>
80 </Reference> 80 </Reference>
81 <Reference Include="XMLRPC.dll" >
82 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private>
84 </Reference>
81 </ItemGroup> 85 </ItemGroup>
82 <ItemGroup> 86 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> 87 <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
84 <Name>OpenSim.Caches</Name>
85 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
90 <Name>OpenSim.Framework</Name> 88 <Name>OpenSim.Framework</Name>
91 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 91 <Private>False</Private>
94 </ProjectReference> 92 </ProjectReference>
95 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 93 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
96 <Name>OpenSim.Framework.Console</Name> 94 <Name>OpenSim.Framework.Console</Name>
97 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 95 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 97 <Private>False</Private>
100 </ProjectReference> 98 </ProjectReference>
101 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> 99 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
102 <Name>OpenSim.GenericConfig.Xml</Name> 100 <Name>OpenSim.Framework.Servers</Name>
103 <Project>{E88EF749-0000-0000-0000-000000000000}</Project> 101 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 103 <Private>False</Private>
106 </ProjectReference> 104 </ProjectReference>
107 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 105 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
108 <Name>OpenSim.Physics.Manager</Name> 106 <Name>OpenSim.Region.Caches</Name>
109 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 107 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private> 109 <Private>False</Private>
112 </ProjectReference> 110 </ProjectReference>
113 <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj"> 111 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
114 <Name>OpenSim.Region</Name> 112 <Name>OpenSim.Region.Physics.Manager</Name>
115 <Project>{196916AF-0000-0000-0000-000000000000}</Project> 113 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private> 115 <Private>False</Private>
118 </ProjectReference> 116 </ProjectReference>
119 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 117 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
120 <Name>OpenSim.Servers</Name> 118 <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
121 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 119 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
123 <Private>False</Private>
124 </ProjectReference>
125 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
126 <Name>OpenSim.Terrain.BasicTerrain</Name>
127 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
128 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
129 <Private>False</Private>
130 </ProjectReference>
131 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
132 <Name>XMLRPC</Name>
133 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
134 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
135 <Private>False</Private> 121 <Private>False</Private>
136 </ProjectReference> 122 </ProjectReference>
@@ -166,9 +152,6 @@
166 <Compile Include="UDPServer.cs"> 152 <Compile Include="UDPServer.cs">
167 <SubType>Code</SubType> 153 <SubType>Code</SubType>
168 </Compile> 154 </Compile>
169 <Compile Include="VersionInfo.cs">
170 <SubType>Code</SubType>
171 </Compile>
172 <Compile Include="Assets\InventoryCache.cs"> 155 <Compile Include="Assets\InventoryCache.cs">
173 <SubType>Code</SubType> 156 <SubType>Code</SubType>
174 </Compile> 157 </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 12dca8a..f76a4c8 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -1,5 +1,5 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.RegionServer" default="build"> 2<project name="OpenSim.Region.ClientStack" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ClientStackNetworkHandler.cs" /> 14 <include name="ClientStackNetworkHandler.cs" />
@@ -21,7 +21,6 @@
21 <include name="PacketServer.cs" /> 21 <include name="PacketServer.cs" />
22 <include name="RegionApplicationBase.cs" /> 22 <include name="RegionApplicationBase.cs" />
23 <include name="UDPServer.cs" /> 23 <include name="UDPServer.cs" />
24 <include name="VersionInfo.cs" />
25 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
26 </sources> 25 </sources>
27 <references basedir="${project::get-base-directory()}"> 26 <references basedir="${project::get-base-directory()}">
@@ -29,25 +28,23 @@
29 <include name="${project::get-base-directory()}" /> 28 <include name="${project::get-base-directory()}" />
30 <include name="${project::get-base-directory()}/${build.dir}" /> 29 <include name="${project::get-base-directory()}/${build.dir}" />
31 </lib> 30 </lib>
32 <include name="../../bin/Axiom.MathLib.dll" /> 31 <include name="../../../bin/Axiom.MathLib.dll" />
33 <include name="../../bin/Db4objects.Db4o.dll" /> 32 <include name="../../../bin/Db4objects.Db4o.dll" />
34 <include name="../../bin/libsecondlife.dll" /> 33 <include name="../../../bin/libsecondlife.dll" />
35 <include name="../../bin/OpenSim.Caches.dll" /> 34 <include name="../../../bin/OpenSim.Framework.dll" />
36 <include name="../../bin/OpenSim.Framework.dll" /> 35 <include name="../../../bin/OpenSim.Framework.Console.dll" />
37 <include name="../../bin/OpenSim.Framework.Console.dll" /> 36 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
38 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> 37 <include name="../../../bin/OpenSim.Region.Caches.dll" />
39 <include name="../../bin/OpenSim.Physics.Manager.dll" /> 38 <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" />
40 <include name="../../bin/OpenSim.Region.dll" /> 39 <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />
41 <include name="../../bin/OpenSim.Servers.dll" />
42 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
43 <include name="System.dll" /> 40 <include name="System.dll" />
44 <include name="System.Xml.dll" /> 41 <include name="System.Xml.dll" />
45 <include name="../../bin/XMLRPC.dll" /> 42 <include name="../../../bin/XMLRPC.dll" />
46 </references> 43 </references>
47 </csc> 44 </csc>
48 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 45 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
49 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 46 <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
50 <copy todir="${project::get-base-directory()}/../../bin/"> 47 <copy todir="${project::get-base-directory()}/../../../bin/">
51 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 48 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
52 <include name="*.dll"/> 49 <include name="*.dll"/>
53 <include name="*.exe"/> 50 <include name="*.exe"/>
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 229570c..ffd254e 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
34using System.Net; 34using System.Net;
35using System.Net.Sockets; 35using System.Net.Sockets;
36using OpenSim.Assets; 36using OpenSim.Assets;
37using OpenSim.Caches; 37using OpenSim.Region.Caches;
38 38
39namespace OpenSim 39namespace OpenSim.Region.ClientStack
40{ 40{
41 public class PacketServer 41 public class PacketServer
42 { 42 {
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 68a140b..94db8ee 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -37,19 +37,18 @@ using System.Collections;
37using System.Collections.Generic; 37using System.Collections.Generic;
38using libsecondlife; 38using libsecondlife;
39using libsecondlife.Packets; 39using libsecondlife.Packets;
40using OpenSim.Terrain; 40using OpenSim.Region.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Assets; 44using OpenSim.Assets;
45using OpenSim.Caches; 45using OpenSim.Region.Caches;
46using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
47using OpenSim.Physics.Manager; 47using OpenSim.Physics.Manager;
48using Nwc.XmlRpc; 48using Nwc.XmlRpc;
49using OpenSim.Servers; 49using OpenSim.Framework.Servers;
50using OpenSim.GenericConfig;
51 50
52namespace OpenSim 51namespace OpenSim.Region.ClientStack
53{ 52{
54 public class RegionApplicationBase 53 public class RegionApplicationBase
55 { 54 {
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9..259352c 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -37,18 +37,17 @@ using System.Collections;
37using System.Collections.Generic; 37using System.Collections.Generic;
38using libsecondlife; 38using libsecondlife;
39using libsecondlife.Packets; 39using libsecondlife.Packets;
40using OpenSim.Terrain; 40using OpenSim.Region.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.Assets; 43using OpenSim.Assets;
44using OpenSim.Caches; 44using OpenSim.Region.Caches;
45using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
46using OpenSim.Framework; 46using OpenSim.Framework;
47using Nwc.XmlRpc; 47using Nwc.XmlRpc;
48using OpenSim.Servers; 48using OpenSim.Framework.Servers;
49using OpenSim.GenericConfig;
50 49
51namespace OpenSim 50namespace OpenSim.Region.ClientStack
52{ 51{
53 52
54 public class UDPServer : ClientStackNetworkHandler 53 public class UDPServer : ClientStackNetworkHandler
generated by cgit v1.1 at 2024-12-22 20:39:43 +0000