aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs50
-rw-r--r--Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs (renamed from Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs)41
-rw-r--r--Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs36
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj25
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs20
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs60
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs15
-rw-r--r--Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs30
-rw-r--r--Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs10
-rw-r--r--Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs10
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj6
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build2
-rw-r--r--OpenGridServices.build3
-rw-r--r--OpenGridServices.sln115
-rw-r--r--OpenGridServices.suobin139776 -> 139776 bytes
-rw-r--r--OpenSim.sln231
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj8
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build4
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj4
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build2
-rw-r--r--OpenSim/OpenSim.World/OpenSim.World.csproj22
-rw-r--r--OpenSim/OpenSim.World/World.cs6
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs6
23 files changed, 444 insertions, 262 deletions
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
new file mode 100644
index 0000000..11b5ea7
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerBase.cs
@@ -0,0 +1,50 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenSim.Framework;
6
7namespace OpenGrid.Framework.Communications.GridServer
8{
9 public class GridCommsManagerBase
10 {
11 public GridCommsManagerBase()
12 {
13 }
14 /// <summary>
15 ///
16 /// </summary>
17 /// <param name="regionInfo"></param>
18 /// <returns></returns>
19 public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
20 {
21 return null;
22 }
23
24 /// <summary>
25 ///
26 /// </summary>
27 /// <param name="regionInfo"></param>
28 /// <returns></returns>
29 public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
30 {
31 return null;
32 }
33
34 /// <summary>
35 ///
36 /// </summary>
37 /// <returns></returns>
38 public virtual bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
39 {
40 return false;
41 }
42
43 public virtual bool AddNewSession(ulong regionHandle, Login loginData)
44 {
45 return false;
46 }
47
48
49 }
50}
diff --git a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
index fad2001..774585a 100644
--- a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerLocal.cs
@@ -1,29 +1,24 @@
1using System; 1using System;
2using System.Collections;
3using System.Collections.Generic; 2using System.Collections.Generic;
4using System.Text; 3using System.Text;
5using libsecondlife; 4
6using OpenSim.Framework; 5using OpenSim.Framework;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types; 6using OpenSim.Framework.Types;
9 7
10namespace OpenGrid.Framework.Communications 8using libsecondlife;
9
10namespace OpenGrid.Framework.Communications.GridServer
11{ 11{
12 public class TestLocalCommsManager : RegionServerCommsManager 12 public class GridCommsManagerLocal : GridCommsManagerBase
13 { 13 {
14 protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong,RegionInfo>(); 14 protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
15 protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>(); 15 protected Dictionary<ulong, RegionCommsHostBase> regionHosts = new Dictionary<ulong, RegionCommsHostBase>();
16 16
17 public TestLocalCommsManager() 17 public GridCommsManagerLocal()
18 { 18 {
19 19
20 } 20 }
21 21
22 /// <summary>
23 ///
24 /// </summary>
25 /// <param name="regionInfo"></param>
26 /// <returns></returns>
27 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo) 22 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
28 { 23 {
29 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); 24 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
@@ -32,27 +27,23 @@ namespace OpenGrid.Framework.Communications
32 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle ); 27 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
33 this.regions.Add(regionInfo.RegionHandle, regionInfo); 28 this.regions.Add(regionInfo.RegionHandle, regionInfo);
34 RegionCommsHostBase regionHost = new RegionCommsHostBase(); 29 RegionCommsHostBase regionHost = new RegionCommsHostBase();
35 this.regionHosts.Add(regionInfo.RegionHandle, regionHost); 30 this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
36 return regionHost; 31 return regionHost;
37 } 32 }
38 33
39 //already in our list of regions so for now lets return null 34 //already in our list of regions so for now lets return null
40 return null; 35 return null;
41 } 36 }
42 37
43 /// <summary> 38
44 ///
45 /// </summary>
46 /// <param name="regionInfo"></param>
47 /// <returns></returns>
48 public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo) 39 public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
49 { 40 {
50 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle); 41 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
51 List<RegionInfo> neighbours = new List<RegionInfo>(); 42 List<RegionInfo> neighbours = new List<RegionInfo>();
52 43
53 foreach (RegionInfo reg in this.regions.Values) 44 foreach (RegionInfo reg in this.regions.Values)
54 { 45 {
55 // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY); 46 // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
56 if (reg.RegionHandle != regionInfo.RegionHandle) 47 if (reg.RegionHandle != regionInfo.RegionHandle)
57 { 48 {
58 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location"); 49 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
@@ -68,16 +59,12 @@ namespace OpenGrid.Framework.Communications
68 return neighbours; 59 return neighbours;
69 } 60 }
70 61
71 /// <summary>
72 ///
73 /// </summary>
74 /// <returns></returns>
75 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData 62 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
76 { 63 {
77 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); 64 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
78 if (this.regionHosts.ContainsKey(regionHandle)) 65 if (this.regionHosts.ContainsKey(regionHandle))
79 { 66 {
80 // Console.WriteLine("CommsManager- Informing a region to expect child agent"); 67 // Console.WriteLine("CommsManager- Informing a region to expect child agent");
81 this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData); 68 this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
82 return true; 69 return true;
83 } 70 }
@@ -90,7 +77,7 @@ namespace OpenGrid.Framework.Communications
90 /// <param name="regionHandle"></param> 77 /// <param name="regionHandle"></param>
91 /// <param name="loginData"></param> 78 /// <param name="loginData"></param>
92 /// <returns></returns> 79 /// <returns></returns>
93 public bool AddNewSession(ulong regionHandle, Login loginData) 80 public override bool AddNewSession(ulong regionHandle, Login loginData)
94 { 81 {
95 //Console.WriteLine(" comms manager been told to expect new user"); 82 //Console.WriteLine(" comms manager been told to expect new user");
96 AgentCircuitData agent = new AgentCircuitData(); 83 AgentCircuitData agent = new AgentCircuitData();
diff --git a/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
new file mode 100644
index 0000000..415c1d8
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/GridServer/GridCommsManagerOGS.cs
@@ -0,0 +1,36 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5using OpenSim.Framework;
6using OpenSim.Framework.Types;
7
8namespace OpenGrid.Framework.Communications.GridServer
9{
10 public class GridCommsManagerOGS : GridCommsManagerBase
11 {
12 public GridCommsManagerOGS()
13 {
14 }
15
16 public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
17 {
18 return null;
19 }
20
21 public override List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
22 {
23 return null;
24 }
25
26 public override bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
27 {
28 return false;
29 }
30
31 public override bool AddNewSession(ulong regionHandle, Login loginData)
32 {
33 return false;
34 }
35 }
36}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 00b1548..689210b 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -80,15 +80,36 @@
80 </ProjectReference> 80 </ProjectReference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <Compile Include="RegionServerCommsManager.cs"> 83 <Compile Include="RegionServerCommsLocal.cs">
84 <SubType>Code</SubType>
85 </Compile>
86 <Compile Include="RegionServerCommsOGS.cs">
84 <SubType>Code</SubType> 87 <SubType>Code</SubType>
85 </Compile> 88 </Compile>
86 <Compile Include="TestLocalCommsManager.cs"> 89 <Compile Include="RegionServerCommsManager.cs">
87 <SubType>Code</SubType> 90 <SubType>Code</SubType>
88 </Compile> 91 </Compile>
89 <Compile Include="Properties\AssemblyInfo.cs"> 92 <Compile Include="Properties\AssemblyInfo.cs">
90 <SubType>Code</SubType> 93 <SubType>Code</SubType>
91 </Compile> 94 </Compile>
95 <Compile Include="UserServer\UserCommsManagerOGS.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="UserServer\UserCommsManagerLocal.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 <Compile Include="UserServer\UserCommsManagerBase.cs">
102 <SubType>Code</SubType>
103 </Compile>
104 <Compile Include="GridServer\GridCommsManagerLocal.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="GridServer\GridCommsManagerOGS.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="GridServer\GridCommsManagerBase.cs">
111 <SubType>Code</SubType>
112 </Compile>
92 </ItemGroup> 113 </ItemGroup>
93 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 114 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
94 <PropertyGroup> 115 <PropertyGroup>
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
new file mode 100644
index 0000000..0743cbf
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsLocal.cs
@@ -0,0 +1,20 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5using libsecondlife;
6using OpenSim.Framework;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9
10namespace OpenGrid.Framework.Communications
11{
12 public class RegionServerCommsLocal : RegionServerCommsManager
13 {
14 public RegionServerCommsLocal()
15 {
16 userServer = new UserServer.UserCommsManagerLocal(); //Local User Server
17 gridServer = new GridServer.GridCommsManagerLocal(); //Locl Grid Server
18 }
19 }
20}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index fa786d3..38bce42 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -12,66 +12,12 @@ namespace OpenGrid.Framework.Communications
12 12
13 public class RegionServerCommsManager 13 public class RegionServerCommsManager
14 { 14 {
15 public UserServer.UserCommsManagerBase userServer;
16 public GridServer.GridCommsManagerBase gridServer;
15 17
16 public RegionServerCommsManager() 18 public RegionServerCommsManager()
17 { 19 {
18 20
19 }
20
21 /// <summary>
22 ///
23 /// </summary>
24 /// <returns></returns>
25 public virtual RegionInfo LoadRegionConfigFromGridServer(LLUUID regionID)
26 {
27 return null;
28 }
29
30 /// <summary>
31 ///
32 /// </summary>
33 /// <param name="regionInfo"></param>
34 /// <returns></returns>
35 public virtual RegionCommsHostBase RegisterRegion(RegionInfo regionInfo)
36 {
37 return null;
38 }
39
40 /// <summary>
41 ///
42 /// </summary>
43 /// <param name="regionInfo"></param>
44 /// <returns></returns>
45 public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
46 {
47 return null;
48 }
49
50 /// <summary>
51 ///
52 /// </summary>
53 /// <returns></returns>
54 public virtual bool InformNeighbourOfChildAgent( ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
55 {
56 return false;
57 }
58
59 /// <summary>
60 ///
61 /// </summary>
62 /// <returns></returns>
63 public virtual bool AvatarCrossingToRegion()
64 {
65 return false;
66 }
67
68 /// <summary>
69 ///
70 /// </summary>
71 /// <returns></returns>
72 public virtual IList RequestMapBlocks()
73 {
74 return null;
75 } 21 }
76 } 22 }
77} 23}
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
new file mode 100644
index 0000000..b0db473
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsOGS.cs
@@ -0,0 +1,15 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenGrid.Framework.Communications
6{
7 public class RegionServerCommsOGS : RegionServerCommsManager
8 {
9 public RegionServerCommsOGS()
10 {
11 userServer = new UserServer.UserCommsManagerOGS(); //Remote User Server
12 gridServer = new GridServer.GridCommsManagerOGS(); //Remote Grid Server
13 }
14 }
15}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
new file mode 100644
index 0000000..9ea4ae8
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
@@ -0,0 +1,30 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5using libsecondlife;
6namespace OpenGrid.Framework.Communications.UserServer
7{
8 public class UserCommsManagerBase
9 {
10 public UserCommsManagerBase()
11 {
12 }
13
14 public virtual UserProfileData GetUserProfile(string name)
15 {
16 return null;
17 }
18 public virtual UserProfileData GetUserProfile(LLUUID avatar_id)
19 {
20 return null;
21 }
22 }
23
24 public class UserProfileData
25 {
26 public UserProfileData()
27 {
28 }
29 }
30}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
new file mode 100644
index 0000000..eb0881a
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
@@ -0,0 +1,10 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenGrid.Framework.Communications.UserServer
6{
7 public class UserCommsManagerLocal : UserCommsManagerBase
8 {
9 }
10}
diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
new file mode 100644
index 0000000..0921535
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
@@ -0,0 +1,10 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenGrid.Framework.Communications.UserServer
6{
7 public class UserCommsManagerOGS : UserCommsManagerBase
8 {
9 }
10}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index ab29d04..7e14e6a 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -195,6 +195,9 @@
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">
199 <SubType>Code</SubType>
200 </Compile>
198 <Compile Include="Types\ParcelData.cs"> 201 <Compile Include="Types\ParcelData.cs">
199 <SubType>Code</SubType> 202 <SubType>Code</SubType>
200 </Compile> 203 </Compile>
@@ -225,9 +228,6 @@
225 <Compile Include="Types\AssetBase.cs"> 228 <Compile Include="Types\AssetBase.cs">
226 <SubType>Code</SubType> 229 <SubType>Code</SubType>
227 </Compile> 230 </Compile>
228 <Compile Include="Types\RegionInfo.cs">
229 <SubType>Code</SubType>
230 </Compile>
231 </ItemGroup> 231 </ItemGroup>
232 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 232 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
233 <PropertyGroup> 233 <PropertyGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index a45a121..2678e54 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -46,6 +46,7 @@
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/ParcelData.cs" />
50 <include name="Types/AgentWearable.cs" /> 51 <include name="Types/AgentWearable.cs" />
51 <include name="Types/PrimData.cs" /> 52 <include name="Types/PrimData.cs" />
@@ -56,7 +57,6 @@
56 <include name="Types/Login.cs" /> 57 <include name="Types/Login.cs" />
57 <include name="Types/AssetLandmark.cs" /> 58 <include name="Types/AssetLandmark.cs" />
58 <include name="Types/AssetBase.cs" /> 59 <include name="Types/AssetBase.cs" />
59 <include name="Types/RegionInfo.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/OpenGridServices.build b/OpenGridServices.build
index d240dc0..f1cbab8 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -51,7 +51,6 @@
51 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> 51 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
52 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" /> 52 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />
53 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" /> 53 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
54 <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="clean" />
55 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" /> 54 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" />
56 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> 55 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
57 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" /> 56 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
@@ -67,7 +66,6 @@
67 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" /> 66 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" />
68 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" /> 67 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" />
69 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" /> 68 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" />
70 <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="build" />
71 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 69 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
72 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> 70 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
73 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 71 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
@@ -88,7 +86,6 @@
88 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> 86 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
89 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" /> 87 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />
90 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" /> 88 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
91 <nant buildfile="OpenGridServices/ServiceManager/ServiceManager.exe.build" target="doc" />
92 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" /> 89 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" />
93 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> 90 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
94 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" /> 91 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 3996190..86cb4ad 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -23,57 +23,66 @@ EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" 23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"
24EndProject 24EndProject
25Global 25Global
26 GlobalSection(SolutionConfigurationPlatforms) = preSolution 26 GlobalSection(SolutionConfigurationPlatforms) = preSolution
27 Debug|Any CPU = Debug|Any CPU 27 Debug|Any CPU = Debug|Any CPU
28 Release|Any CPU = Release|Any CPU 28 Release|Any CPU = Release|Any CPU
29 EndGlobalSection 29 EndGlobalSection
30 GlobalSection(ProjectConfigurationPlatforms) = postSolution 30 GlobalSection(ProjectDependencies) = postSolution
31 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 31 ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000})
32 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 32 ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
33 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 33 ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000})
34 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 34 ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000})
35 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 35 ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
36 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 36 ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000})
37 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 37 ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
38 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 38 EndGlobalSection
39 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 39 GlobalSection(ProjectConfigurationPlatforms) = postSolution
40 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 40 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 41 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
42 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 42 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
43 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 43 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
44 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 44 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 45 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
46 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 46 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
47 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 47 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
48 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 48 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 49 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
50 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 50 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
51 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 51 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
52 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 52 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 53 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
54 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 54 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
55 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 55 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
56 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 56 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 57 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
58 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 58 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
59 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 59 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
60 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 60 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 61 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
62 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 62 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
63 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 63 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
64 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 64 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 65 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
66 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 66 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
67 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
68 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 69 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
70 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 70 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
71 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 71 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
72 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 72 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 73 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
74 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 74 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
75 EndGlobalSection 75 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
76 GlobalSection(SolutionProperties) = preSolution 76 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
77 HideSolutionNode = FALSE 77 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
78 EndGlobalSection 78 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
79 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
80 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
82 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
83 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
84 EndGlobalSection
85 GlobalSection(SolutionProperties) = preSolution
86 HideSolutionNode = FALSE
87 EndGlobalSection
79EndGlobal 88EndGlobal
diff --git a/OpenGridServices.suo b/OpenGridServices.suo
index acde093..728df77 100644
--- a/OpenGridServices.suo
+++ b/OpenGridServices.suo
Binary files differ
diff --git a/OpenSim.sln b/OpenSim.sln
index d2036f0..33a7217 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual C# Express 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
@@ -41,93 +41,144 @@ EndProject
41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
42EndProject 42EndProject
43Global 43Global
44 GlobalSection(SolutionConfigurationPlatforms) = preSolution 44 GlobalSection(SolutionConfigurationPlatforms) = preSolution
45 Debug|Any CPU = Debug|Any CPU 45 Debug|Any CPU = Debug|Any CPU
46 Release|Any CPU = Release|Any CPU 46 Release|Any CPU = Release|Any CPU
47 EndGlobalSection 47 EndGlobalSection
48 GlobalSection(ProjectConfigurationPlatforms) = postSolution 48 GlobalSection(ProjectDependencies) = postSolution
49 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 49 ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
50 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 50 ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
51 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 51 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
52 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 52 ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
53 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 53 ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
54 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 54 ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
55 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
56 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 56 ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
57 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
58 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
59 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
60 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 60 ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000})
61 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
62 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 62 ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
63 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 63 ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
64 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 64 ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
65 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
66 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000})
67 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 67 ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
68 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 68 ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000})
69 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 69 ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000})
70 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 70 ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000})
71 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 71 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
72 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 72 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
73 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 73 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
74 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 74 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
75 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
76 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 76 ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
77 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 77 ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
78 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 78 ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
79 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 79 ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
80 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 80 ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
81 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 81 ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
82 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 82 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
83 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 83 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
84 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 84 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
85 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 85 ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
86 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 86 ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000})
87 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 87 ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
88 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 88 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
89 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 89 ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
90 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 90 ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
91 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 91 ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
92 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 92 ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
93 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 93 ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
94 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 94 ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
95 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 95 ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
96 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 96 ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
97 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 97 ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
98 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 98 EndGlobalSection
99 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 99 GlobalSection(ProjectConfigurationPlatforms) = postSolution
100 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 100 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 101 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
102 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 102 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
103 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 103 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
104 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 104 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 105 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
106 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 106 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
107 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 107 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
108 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 108 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 109 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
110 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 110 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
111 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 111 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
112 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 112 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
113 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 113 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
114 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 114 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
115 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 115 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
116 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 116 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 117 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
118 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 118 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
119 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 119 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
120 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 120 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 121 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
122 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 122 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
123 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 123 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
124 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 124 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 125 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
126 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 126 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
127 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 127 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
128 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 128 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129 EndGlobalSection 129 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
130 GlobalSection(SolutionProperties) = preSolution 130 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
131 HideSolutionNode = FALSE 131 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
132 EndGlobalSection 132 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
134 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
135 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
136 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
138 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
139 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
140 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
142 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
143 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
144 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
146 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
147 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
148 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
150 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
151 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
152 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
154 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
155 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
156 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
158 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
159 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
160 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
161 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
162 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
163 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
164 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
166 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
167 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
168 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
170 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
171 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
172 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
174 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
175 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
176 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
178 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
179 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
180 EndGlobalSection
181 GlobalSection(SolutionProperties) = preSolution
182 HideSolutionNode = FALSE
183 EndGlobalSection
133EndGlobal 184EndGlobal
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index fa91d7d..2fc6516 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -145,10 +145,10 @@
145 <Compile Include="ClientView.Grid.cs"> 145 <Compile Include="ClientView.Grid.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </Compile>
148 <Compile Include="ClientView.PacketHandlers.cs"> 148 <Compile Include="PacketServer.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="ClientView.ProcessPackets.cs"> 151 <Compile Include="ClientView.PacketHandlers.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="VersionInfo.cs"> 154 <Compile Include="VersionInfo.cs">
@@ -169,10 +169,10 @@
169 <Compile Include="ClientView.cs"> 169 <Compile Include="ClientView.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="PacketServer.cs"> 172 <Compile Include="ClientView.API.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="ClientView.API.cs"> 175 <Compile Include="ClientView.ProcessPackets.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="CAPS\AdminWebFront.cs"> 178 <Compile Include="CAPS\AdminWebFront.cs">
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index fc33eb9..c988025 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -18,16 +18,16 @@
18 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="UserConfigUtility.cs" /> 19 <include name="UserConfigUtility.cs" />
20 <include name="ClientView.Grid.cs" /> 20 <include name="ClientView.Grid.cs" />
21 <include name="PacketServer.cs" />
21 <include name="ClientView.PacketHandlers.cs" /> 22 <include name="ClientView.PacketHandlers.cs" />
22 <include name="ClientView.ProcessPackets.cs" />
23 <include name="VersionInfo.cs" /> 23 <include name="VersionInfo.cs" />
24 <include name="AgentAssetUpload.cs" /> 24 <include name="AgentAssetUpload.cs" />
25 <include name="ClientViewBase.cs" /> 25 <include name="ClientViewBase.cs" />
26 <include name="RegionServerBase.cs" /> 26 <include name="RegionServerBase.cs" />
27 <include name="CommsManager.cs" /> 27 <include name="CommsManager.cs" />
28 <include name="ClientView.cs" /> 28 <include name="ClientView.cs" />
29 <include name="PacketServer.cs" />
30 <include name="ClientView.API.cs" /> 29 <include name="ClientView.API.cs" />
30 <include name="ClientView.ProcessPackets.cs" />
31 <include name="CAPS/AdminWebFront.cs" /> 31 <include name="CAPS/AdminWebFront.cs" />
32 <include name="Assets/InventoryCache.cs" /> 32 <include name="Assets/InventoryCache.cs" />
33 <include name="Assets/AssetCache.cs" /> 33 <include name="Assets/AssetCache.cs" />
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 7d90947..af8285b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -96,10 +96,10 @@
96 <Compile Include="MapStorage.cs"> 96 <Compile Include="MapStorage.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="UUIDPrimQuery.cs"> 99 <Compile Include="UUIDParcelQuery.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="UUIDParcelQuery.cs"> 102 <Compile Include="UUIDPrimQuery.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="Db4LocalStorage.cs"> 105 <Compile Include="Db4LocalStorage.cs">
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 9789712..72aac2a 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -13,8 +13,8 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="MapStorage.cs" /> 15 <include name="MapStorage.cs" />
16 <include name="UUIDPrimQuery.cs" />
17 <include name="UUIDParcelQuery.cs" /> 16 <include name="UUIDParcelQuery.cs" />
17 <include name="UUIDPrimQuery.cs" />
18 <include name="Db4LocalStorage.cs" /> 18 <include name="Db4LocalStorage.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index 90e455a..f2fb596 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -130,33 +130,33 @@
130 </ProjectReference> 130 </ProjectReference>
131 </ItemGroup> 131 </ItemGroup>
132 <ItemGroup> 132 <ItemGroup>
133 <Compile Include="Avatar.Client.cs">
134 <SubType>Code</SubType>
135 </Compile>
136 <Compile Include="Entity.cs"> 133 <Compile Include="Entity.cs">
137 <SubType>Code</SubType> 134 <SubType>Code</SubType>
138 </Compile> 135 </Compile>
139 <Compile Include="World.PacketHandlers.cs"> 136 <Compile Include="World.PacketHandlers.cs">
140 <SubType>Code</SubType> 137 <SubType>Code</SubType>
141 </Compile> 138 </Compile>
142 <Compile Include="AvatarAnimations.cs"> 139 <Compile Include="WorldBase.cs">
143 <SubType>Code</SubType> 140 <SubType>Code</SubType>
144 </Compile> 141 </Compile>
145 <Compile Include="SceneObject.cs"> 142 <Compile Include="SceneObject.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
148 <Compile Include="Primitive.cs">
149 <SubType>Code</SubType>
150 </Compile>
151 <Compile Include="World.Scripting.cs"> 145 <Compile Include="World.Scripting.cs">
152 <SubType>Code</SubType> 146 <SubType>Code</SubType>
153 </Compile> 147 </Compile>
154 <Compile Include="WorldBase.cs"> 148 <Compile Include="Avatar.Client.cs">
155 <SubType>Code</SubType> 149 <SubType>Code</SubType>
156 </Compile> 150 </Compile>
157 <Compile Include="Avatar.Update.cs"> 151 <Compile Include="Avatar.Update.cs">
158 <SubType>Code</SubType> 152 <SubType>Code</SubType>
159 </Compile> 153 </Compile>
154 <Compile Include="AvatarAnimations.cs">
155 <SubType>Code</SubType>
156 </Compile>
157 <Compile Include="Primitive.cs">
158 <SubType>Code</SubType>
159 </Compile>
160 <Compile Include="Avatar.cs"> 160 <Compile Include="Avatar.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
@@ -166,6 +166,9 @@
166 <Compile Include="World.cs"> 166 <Compile Include="World.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Estate\EstateManager.cs">
170 <SubType>Code</SubType>
171 </Compile>
169 <Compile Include="scripting\IScriptHandler.cs"> 172 <Compile Include="scripting\IScriptHandler.cs">
170 <SubType>Code</SubType> 173 <SubType>Code</SubType>
171 </Compile> 174 </Compile>
@@ -190,9 +193,6 @@
190 <Compile Include="types\Triangle.cs"> 193 <Compile Include="types\Triangle.cs">
191 <SubType>Code</SubType> 194 <SubType>Code</SubType>
192 </Compile> 195 </Compile>
193 <Compile Include="Estate\EstateManager.cs">
194 <SubType>Code</SubType>
195 </Compile>
196 </ItemGroup> 196 </ItemGroup>
197 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 197 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
198 <PropertyGroup> 198 <PropertyGroup>
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 3e74501..011e39a 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -524,7 +524,7 @@ namespace OpenSim.world
524 protected void InformClientOfNeighbours(IClientAPI remoteClient) 524 protected void InformClientOfNeighbours(IClientAPI remoteClient)
525 { 525 {
526 // Console.WriteLine("informing client of neighbouring regions"); 526 // Console.WriteLine("informing client of neighbouring regions");
527 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); 527 List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo);
528 528
529 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); 529 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
530 if (neighbours != null) 530 if (neighbours != null)
@@ -536,7 +536,7 @@ namespace OpenSim.world
536 agent.BaseFolder = LLUUID.Zero; 536 agent.BaseFolder = LLUUID.Zero;
537 agent.InventoryFolder = LLUUID.Zero; 537 agent.InventoryFolder = LLUUID.Zero;
538 agent.startpos = new LLVector3(128, 128, 70); 538 agent.startpos = new LLVector3(128, 128, 70);
539 this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); 539 this.commsManager.gridServer.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
540 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); 540 remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
541 } 541 }
542 } 542 }
@@ -594,7 +594,7 @@ namespace OpenSim.world
594 594
595 public void RegisterRegionWithComms() 595 public void RegisterRegionWithComms()
596 { 596 {
597 this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo); 597 this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo);
598 if (this.regionCommsHost != null) 598 if (this.regionCommsHost != null)
599 { 599 {
600 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); 600 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 1864e06..1174455 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -103,12 +103,12 @@ namespace OpenSim
103 this.SetupLocalGridServers(); 103 this.SetupLocalGridServers();
104 this.checkServer = new CheckSumServer(12036); 104 this.checkServer = new CheckSumServer(12036);
105 this.checkServer.ServerListener(); 105 this.checkServer.ServerListener();
106 this.commsManager = new TestLocalCommsManager(); 106 this.commsManager = new RegionServerCommsOGS();
107 } 107 }
108 else 108 else
109 { 109 {
110 this.SetupRemoteGridServers(); 110 this.SetupRemoteGridServers();
111 this.commsManager = new TestLocalCommsManager(); //should be a remote comms manager class 111 this.commsManager = new RegionServerCommsLocal();
112 } 112 }
113 113
114 startuptime = DateTime.Now; 114 startuptime = DateTime.Now;
@@ -131,7 +131,7 @@ namespace OpenSim
131 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); 131 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
132 loginServer.Startup(); 132 loginServer.Startup();
133 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession); 133 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);
134 loginServer.SetSessionHandler(((TestLocalCommsManager)this.commsManager).AddNewSession); 134 loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).gridServer.AddNewSession);
135 //sandbox mode with loginserver not using accounts 135 //sandbox mode with loginserver not using accounts
136 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 136 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
137 } 137 }
generated by cgit v1.1 at 2024-07-16 09:42:36 +0000