aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user2
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs6
-rw-r--r--Common/OpenSim.Framework/Interfaces/ILocalStorage.cs14
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj16
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj.user2
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build8
-rw-r--r--Common/OpenSim.Framework/Types/RegionInfo.cs59
-rw-r--r--Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user2
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj14
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj.user2
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.dll.build6
-rw-r--r--Common/XmlRpcCS/XMLRPC.csproj36
-rw-r--r--Common/XmlRpcCS/XMLRPC.csproj.user2
-rw-r--r--Common/XmlRpcCS/XMLRPC.dll.build22
14 files changed, 93 insertions, 98 deletions
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
+++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 810345f..3eed2b8 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -29,6 +29,11 @@ namespace OpenSim.Framework.Interfaces
29 public delegate void StatusChange(bool status); 29 public delegate void StatusChange(bool status);
30 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); 30 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
31 31
32 public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
33 public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
34 public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
35 public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); // NOTETOSELFremove the packet part
36
32 public interface IClientAPI 37 public interface IClientAPI
33 { 38 {
34 event ChatFromViewer OnChatFromViewer; 39 event ChatFromViewer OnChatFromViewer;
@@ -81,7 +86,6 @@ namespace OpenSim.Framework.Interfaces
81 void SendWearables(AvatarWearable[] wearables); 86 void SendWearables(AvatarWearable[] wearables);
82 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 87 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
83 void SendLayerData(float[] map); 88 void SendLayerData(float[] map);
84 void SendRegionHandshake(RegionInfo regionInfo);
85 void MoveAgentIntoRegion(RegionInfo regInfo); 89 void MoveAgentIntoRegion(RegionInfo regInfo);
86 void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos); 90 void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);
87 void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort); 91 void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
diff --git a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..7307966 100644
--- a/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -37,11 +37,20 @@ namespace OpenSim.Framework.Interfaces
37 public interface ILocalStorage 37 public interface ILocalStorage
38 { 38 {
39 void Initialise(string datastore); 39 void Initialise(string datastore);
40
40 void StorePrim(PrimData prim); 41 void StorePrim(PrimData prim);
41 void RemovePrim(LLUUID primID); 42 void RemovePrim(LLUUID primID);
42 void LoadPrimitives(ILocalStorageReceiver receiver); 43 void LoadPrimitives(ILocalStorageReceiver receiver);
44
43 float[] LoadWorld(); 45 float[] LoadWorld();
44 void SaveMap(float[] heightmap); 46 void SaveMap(float[] heightmap);
47
48 void SaveParcels(ParcelData[] parcels);
49 void SaveParcel(ParcelData parcel);
50 void RemoveParcel(ParcelData parcel);
51 void RemoveAllParcels();
52 void LoadParcels(ILocalStorageParcelReceiver recv);
53
45 void ShutDown(); 54 void ShutDown();
46 } 55 }
47 56
@@ -50,5 +59,10 @@ namespace OpenSim.Framework.Interfaces
50 void PrimFromStorage(PrimData prim); 59 void PrimFromStorage(PrimData prim);
51 } 60 }
52 61
62 public interface ILocalStorageParcelReceiver
63 {
64 void ParcelFromStorage(ParcelData data);
65 void NoParcelDataFromStorage();
66 }
53} 67}
54 68
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 39ce0ff..ab29d04 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -144,15 +144,15 @@
144 <Compile Include="Interfaces\IWorld.cs"> 144 <Compile Include="Interfaces\IWorld.cs">
145 <SubType>Code</SubType> 145 <SubType>Code</SubType>
146 </Compile> 146 </Compile>
147 <Compile Include="Interfaces\IClientAPI.cs">
148 <SubType>Code</SubType>
149 </Compile>
150 <Compile Include="Interfaces\IGridServer.cs"> 147 <Compile Include="Interfaces\IGridServer.cs">
151 <SubType>Code</SubType> 148 <SubType>Code</SubType>
152 </Compile> 149 </Compile>
153 <Compile Include="Interfaces\ILocalStorage.cs"> 150 <Compile Include="Interfaces\ILocalStorage.cs">
154 <SubType>Code</SubType> 151 <SubType>Code</SubType>
155 </Compile> 152 </Compile>
153 <Compile Include="Interfaces\IClientAPI.cs">
154 <SubType>Code</SubType>
155 </Compile>
156 <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> 156 <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
157 <SubType>Code</SubType> 157 <SubType>Code</SubType>
158 </Compile> 158 </Compile>
@@ -195,7 +195,7 @@
195 <Compile Include="Types\NetworkServersInfo.cs"> 195 <Compile Include="Types\NetworkServersInfo.cs">
196 <SubType>Code</SubType> 196 <SubType>Code</SubType>
197 </Compile> 197 </Compile>
198 <Compile Include="Types\RegionInfo.cs"> 198 <Compile Include="Types\ParcelData.cs">
199 <SubType>Code</SubType> 199 <SubType>Code</SubType>
200 </Compile> 200 </Compile>
201 <Compile Include="Types\AgentWearable.cs"> 201 <Compile Include="Types\AgentWearable.cs">
@@ -207,6 +207,9 @@
207 <Compile Include="Types\AssetStorage.cs"> 207 <Compile Include="Types\AssetStorage.cs">
208 <SubType>Code</SubType> 208 <SubType>Code</SubType>
209 </Compile> 209 </Compile>
210 <Compile Include="Types\EstateSettings.cs">
211 <SubType>Code</SubType>
212 </Compile>
210 <Compile Include="Types\OSVector3.cs"> 213 <Compile Include="Types\OSVector3.cs">
211 <SubType>Code</SubType> 214 <SubType>Code</SubType>
212 </Compile> 215 </Compile>
@@ -222,10 +225,7 @@
222 <Compile Include="Types\AssetBase.cs"> 225 <Compile Include="Types\AssetBase.cs">
223 <SubType>Code</SubType> 226 <SubType>Code</SubType>
224 </Compile> 227 </Compile>
225 <Compile Include="Types\ParcelData.cs"> 228 <Compile Include="Types\RegionInfo.cs">
226 <SubType>Code</SubType>
227 </Compile>
228 <Compile Include="Types\EstateSettings.cs">
229 <SubType>Code</SubType> 229 <SubType>Code</SubType>
230 </Compile> 230 </Compile>
231 </ItemGroup> 231 </ItemGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index a75388f..a45a121 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -29,9 +29,9 @@
29 <include name="Interfaces/IUserServer.cs" /> 29 <include name="Interfaces/IUserServer.cs" />
30 <include name="Interfaces/IAssetServer.cs" /> 30 <include name="Interfaces/IAssetServer.cs" />
31 <include name="Interfaces/IWorld.cs" /> 31 <include name="Interfaces/IWorld.cs" />
32 <include name="Interfaces/IClientAPI.cs" />
33 <include name="Interfaces/IGridServer.cs" /> 32 <include name="Interfaces/IGridServer.cs" />
34 <include name="Interfaces/ILocalStorage.cs" /> 33 <include name="Interfaces/ILocalStorage.cs" />
34 <include name="Interfaces/IClientAPI.cs" />
35 <include name="Interfaces/Scripting/IScriptEngine.cs" /> 35 <include name="Interfaces/Scripting/IScriptEngine.cs" />
36 <include name="Interfaces/Scripting/IScriptAPI.cs" /> 36 <include name="Interfaces/Scripting/IScriptAPI.cs" />
37 <include name="Interfaces/Remoting/IProxyServerHost.cs" /> 37 <include name="Interfaces/Remoting/IProxyServerHost.cs" />
@@ -46,17 +46,17 @@
46 <include name="Properties/AssemblyInfo.cs" /> 46 <include name="Properties/AssemblyInfo.cs" />
47 <include name="Types/NeighbourInfo.cs" /> 47 <include name="Types/NeighbourInfo.cs" />
48 <include name="Types/NetworkServersInfo.cs" /> 48 <include name="Types/NetworkServersInfo.cs" />
49 <include name="Types/RegionInfo.cs" /> 49 <include name="Types/ParcelData.cs" />
50 <include name="Types/AgentWearable.cs" /> 50 <include name="Types/AgentWearable.cs" />
51 <include name="Types/PrimData.cs" /> 51 <include name="Types/PrimData.cs" />
52 <include name="Types/AssetStorage.cs" /> 52 <include name="Types/AssetStorage.cs" />
53 <include name="Types/EstateSettings.cs" />
53 <include name="Types/OSVector3.cs" /> 54 <include name="Types/OSVector3.cs" />
54 <include name="Types/AgentCiruitData.cs" /> 55 <include name="Types/AgentCiruitData.cs" />
55 <include name="Types/Login.cs" /> 56 <include name="Types/Login.cs" />
56 <include name="Types/AssetLandmark.cs" /> 57 <include name="Types/AssetLandmark.cs" />
57 <include name="Types/AssetBase.cs" /> 58 <include name="Types/AssetBase.cs" />
58 <include name="Types/ParcelData.cs" /> 59 <include name="Types/RegionInfo.cs" />
59 <include name="Types/EstateSettings.cs" />
60 </sources> 60 </sources>
61 <references basedir="${project::get-base-directory()}"> 61 <references basedir="${project::get-base-directory()}">
62 <lib> 62 <lib>
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/Common/OpenSim.Framework/Types/RegionInfo.cs
index fd3b24f..7fa7fe2 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/Common/OpenSim.Framework/Types/RegionInfo.cs
@@ -10,47 +10,24 @@ namespace OpenSim.Framework.Types
10{ 10{
11 public class RegionInfo 11 public class RegionInfo
12 { 12 {
13 public LLUUID SimUUID; 13 public LLUUID SimUUID = new LLUUID();
14 public string RegionName; 14 public string RegionName = "";
15 public uint RegionLocX; 15 public uint RegionLocX = 0;
16 public uint RegionLocY; 16 public uint RegionLocY = 0;
17 public ulong RegionHandle; 17 public ulong RegionHandle = 0;
18 public ushort RegionWaterHeight = 20; 18
19 public bool RegionTerraform = true; 19 public string DataStore = "";
20 20 public bool isSandbox = false;
21 public int IPListenPort; 21
22 public string IPListenAddr; 22 public LLUUID MasterAvatarAssignedUUID = new LLUUID();
23 23 public string MasterAvatarFirstName = "";
24 private bool isSandbox; 24 public string MasterAvatarLastName = "";
25 public string DataStore; 25
26 26 public int IPListenPort = 0;
27 // Region Information 27 public string IPListenAddr = "";
28 // Low resolution 'base' textures. No longer used. 28
29 public LLUUID TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default 29
30 public LLUUID TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default 30 public EstateSettings estateSettings;
31 public LLUUID TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
32 public LLUUID TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
33 // Higher resolution terrain textures
34 public LLUUID TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
35 public LLUUID TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
36 public LLUUID TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
37 public LLUUID TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
38 // First quad - each point is bilinearly interpolated at each meter of terrain
39 public float TerrainStartHeight00 = 10.0f; // NW Corner ( I think )
40 public float TerrainStartHeight01 = 10.0f; // NE Corner ( I think )
41 public float TerrainStartHeight10 = 10.0f; // SW Corner ( I think )
42 public float TerrainStartHeight11 = 10.0f; // SE Corner ( I think )
43 // Second quad - also bilinearly interpolated.
44 // Terrain texturing is done that:
45 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
46 public float TerrainHeightRange00 = 60.0f;
47 public float TerrainHeightRange01 = 60.0f;
48 public float TerrainHeightRange10 = 60.0f;
49 public float TerrainHeightRange11 = 60.0f;
50
51 // Terrain Default (Must be in F32 Format!)
52 public string TerrainFile = "default.r32";
53 public double TerrainMultiplier = 60.0;
54 31
55 public RegionInfo() 32 public RegionInfo()
56 { 33 {
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
+++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index e89a62c..6768ce4 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,13 +92,13 @@
92 </ProjectReference> 92 </ProjectReference>
93 </ItemGroup> 93 </ItemGroup>
94 <ItemGroup> 94 <ItemGroup>
95 <Compile Include="BaseHttpServer.cs"> 95 <Compile Include="LoginServer.cs">
96 <SubType>Code</SubType> 96 <SubType>Code</SubType>
97 </Compile> 97 </Compile>
98 <Compile Include="BaseServer.cs"> 98 <Compile Include="BaseHttpServer.cs">
99 <SubType>Code</SubType> 99 <SubType>Code</SubType>
100 </Compile> 100 </Compile>
101 <Compile Include="CheckSumServer.cs"> 101 <Compile Include="BaseServer.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="IRestHandler.cs"> 104 <Compile Include="IRestHandler.cs">
@@ -107,16 +107,16 @@
107 <Compile Include="LocalUserProfileManager.cs"> 107 <Compile Include="LocalUserProfileManager.cs">
108 <SubType>Code</SubType> 108 <SubType>Code</SubType>
109 </Compile> 109 </Compile>
110 <Compile Include="LoginResponse.cs"> 110 <Compile Include="XmlRpcMethod.cs">
111 <SubType>Code</SubType> 111 <SubType>Code</SubType>
112 </Compile> 112 </Compile>
113 <Compile Include="LoginServer.cs"> 113 <Compile Include="LoginResponse.cs">
114 <SubType>Code</SubType> 114 <SubType>Code</SubType>
115 </Compile> 115 </Compile>
116 <Compile Include="UDPServerBase.cs"> 116 <Compile Include="CheckSumServer.cs">
117 <SubType>Code</SubType> 117 <SubType>Code</SubType>
118 </Compile> 118 </Compile>
119 <Compile Include="XmlRpcMethod.cs"> 119 <Compile Include="UDPServerBase.cs">
120 <SubType>Code</SubType> 120 <SubType>Code</SubType>
121 </Compile> 121 </Compile>
122 </ItemGroup> 122 </ItemGroup>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index 41c1350..a2af584 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,15 @@
11 <resources prefix="OpenSim.Servers" dynamicprefix="true" > 11 <resources prefix="OpenSim.Servers" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="LoginServer.cs" />
14 <include name="BaseHttpServer.cs" /> 15 <include name="BaseHttpServer.cs" />
15 <include name="BaseServer.cs" /> 16 <include name="BaseServer.cs" />
16 <include name="CheckSumServer.cs" />
17 <include name="IRestHandler.cs" /> 17 <include name="IRestHandler.cs" />
18 <include name="LocalUserProfileManager.cs" /> 18 <include name="LocalUserProfileManager.cs" />
19 <include name="XmlRpcMethod.cs" />
19 <include name="LoginResponse.cs" /> 20 <include name="LoginResponse.cs" />
20 <include name="LoginServer.cs" /> 21 <include name="CheckSumServer.cs" />
21 <include name="UDPServerBase.cs" /> 22 <include name="UDPServerBase.cs" />
22 <include name="XmlRpcMethod.cs" />
23 </sources> 23 </sources>
24 <references basedir="${project::get-base-directory()}"> 24 <references basedir="${project::get-base-directory()}">
25 <lib> 25 <lib>
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 61f8be0..1ab494e 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
70 <ItemGroup> 70 <ItemGroup>
71 </ItemGroup> 71 </ItemGroup>
72 <ItemGroup> 72 <ItemGroup>
73 <Compile Include="Logger.cs"> 73 <Compile Include="XmlRpcBoxcarRequest.cs">
74 <SubType>Code</SubType> 74 <SubType>Code</SubType>
75 </Compile> 75 </Compile>
76 <Compile Include="SimpleHttpRequest.cs"> 76 <Compile Include="XmlRpcRequest.cs">
77 <SubType>Code</SubType> 77 <SubType>Code</SubType>
78 </Compile> 78 </Compile>
79 <Compile Include="XmlRpcBoxcarRequest.cs"> 79 <Compile Include="XmlRpcResponseSerializer.cs">
80 <SubType>Code</SubType> 80 <SubType>Code</SubType>
81 </Compile> 81 </Compile>
82 <Compile Include="XmlRpcClientProxy.cs"> 82 <Compile Include="Logger.cs">
83 <SubType>Code</SubType> 83 <SubType>Code</SubType>
84 </Compile> 84 </Compile>
85 <Compile Include="XmlRpcDeserializer.cs"> 85 <Compile Include="XmlRpcRequestDeserializer.cs">
86 <SubType>Code</SubType> 86 <SubType>Code</SubType>
87 </Compile> 87 </Compile>
88 <Compile Include="XmlRpcErrorCodes.cs"> 88 <Compile Include="XmlRpcExposedAttribute.cs">
89 <SubType>Code</SubType> 89 <SubType>Code</SubType>
90 </Compile> 90 </Compile>
91 <Compile Include="XmlRpcException.cs"> 91 <Compile Include="XmlRpcResponse.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="XmlRpcExposedAttribute.cs"> 94 <Compile Include="XmlRpcException.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="XmlRpcRequest.cs"> 97 <Compile Include="XmlRpcResponder.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="XmlRpcRequestDeserializer.cs"> 100 <Compile Include="XmlRpcResponseDeserializer.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="XmlRpcRequestSerializer.cs"> 103 <Compile Include="XmlRpcServer.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="XmlRpcResponder.cs"> 106 <Compile Include="XmlRpcErrorCodes.cs">
107 <SubType>Code</SubType> 107 <SubType>Code</SubType>
108 </Compile> 108 </Compile>
109 <Compile Include="XmlRpcResponse.cs"> 109 <Compile Include="XmlRpcSerializer.cs">
110 <SubType>Code</SubType> 110 <SubType>Code</SubType>
111 </Compile> 111 </Compile>
112 <Compile Include="XmlRpcResponseDeserializer.cs"> 112 <Compile Include="XmlRpcSystemObject.cs">
113 <SubType>Code</SubType> 113 <SubType>Code</SubType>
114 </Compile> 114 </Compile>
115 <Compile Include="XmlRpcResponseSerializer.cs"> 115 <Compile Include="SimpleHttpRequest.cs">
116 <SubType>Code</SubType> 116 <SubType>Code</SubType>
117 </Compile> 117 </Compile>
118 <Compile Include="XmlRpcSerializer.cs"> 118 <Compile Include="XmlRpcClientProxy.cs">
119 <SubType>Code</SubType> 119 <SubType>Code</SubType>
120 </Compile> 120 </Compile>
121 <Compile Include="XmlRpcServer.cs"> 121 <Compile Include="XmlRpcRequestSerializer.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="XmlRpcSystemObject.cs"> 124 <Compile Include="XmlRpcDeserializer.cs">
125 <SubType>Code</SubType> 125 <SubType>Code</SubType>
126 </Compile> 126 </Compile>
127 <Compile Include="XmlRpcXmlTokens.cs"> 127 <Compile Include="XmlRpcXmlTokens.cs">
diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
index 9bfaf67..082d673 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj.user
+++ b/Common/XmlRpcCS/XMLRPC.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index 2eabfcd..e7936c3 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
11 <resources prefix="XMLRPC" dynamicprefix="true" > 11 <resources prefix="XMLRPC" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Logger.cs" />
15 <include name="SimpleHttpRequest.cs" />
16 <include name="XmlRpcBoxcarRequest.cs" /> 14 <include name="XmlRpcBoxcarRequest.cs" />
17 <include name="XmlRpcClientProxy.cs" />
18 <include name="XmlRpcDeserializer.cs" />
19 <include name="XmlRpcErrorCodes.cs" />
20 <include name="XmlRpcException.cs" />
21 <include name="XmlRpcExposedAttribute.cs" />
22 <include name="XmlRpcRequest.cs" /> 15 <include name="XmlRpcRequest.cs" />
16 <include name="XmlRpcResponseSerializer.cs" />
17 <include name="Logger.cs" />
23 <include name="XmlRpcRequestDeserializer.cs" /> 18 <include name="XmlRpcRequestDeserializer.cs" />
24 <include name="XmlRpcRequestSerializer.cs" /> 19 <include name="XmlRpcExposedAttribute.cs" />
25 <include name="XmlRpcResponder.cs" />
26 <include name="XmlRpcResponse.cs" /> 20 <include name="XmlRpcResponse.cs" />
21 <include name="XmlRpcException.cs" />
22 <include name="XmlRpcResponder.cs" />
27 <include name="XmlRpcResponseDeserializer.cs" /> 23 <include name="XmlRpcResponseDeserializer.cs" />
28 <include name="XmlRpcResponseSerializer.cs" />
29 <include name="XmlRpcSerializer.cs" />
30 <include name="XmlRpcServer.cs" /> 24 <include name="XmlRpcServer.cs" />
25 <include name="XmlRpcErrorCodes.cs" />
26 <include name="XmlRpcSerializer.cs" />
31 <include name="XmlRpcSystemObject.cs" /> 27 <include name="XmlRpcSystemObject.cs" />
28 <include name="SimpleHttpRequest.cs" />
29 <include name="XmlRpcClientProxy.cs" />
30 <include name="XmlRpcRequestSerializer.cs" />
31 <include name="XmlRpcDeserializer.cs" />
32 <include name="XmlRpcXmlTokens.cs" /> 32 <include name="XmlRpcXmlTokens.cs" />
33 </sources> 33 </sources>
34 <references basedir="${project::get-base-directory()}"> 34 <references basedir="${project::get-base-directory()}">