From c84ddd8b0d9f67926458f27d1f6d40c44ff8f355 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 11 Apr 2007 12:32:58 +0000 Subject: [PATCH] * Introduced BaseHttpServer as base for UserHTTPServer and GridHTTPServer --- OpenGridServices.GridServer/GridHttp.cs | 5 +- .../OpenGridServices.GridServer.csproj | 6 + .../OpenGridServices.GridServer.exe.build | 1 + .../OpenGridServices.UserServer.csproj | 6 + .../OpenGridServices.UserServer.exe.build | 1 + OpenGridServices.UserServer/UserHttp.cs | 5 +- ...LocalStorageBerkeleyDB.csproj.FileList.txt | 1 + OpenSim.sln | 226 +++++++----------- bin/OpenSim.Terrain.BasicTerrain.dll | Bin 5632 -> 5632 bytes prebuild.xml | 8 +- 10 files changed, 119 insertions(+), 140 deletions(-) diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs index ed56b63391..5f8bd56b5a 100644 --- a/OpenGridServices.GridServer/GridHttp.cs +++ b/OpenGridServices.GridServer/GridHttp.cs @@ -40,14 +40,15 @@ using System.Collections.Generic; using libsecondlife; using OpenSim.Framework.Sims; using OpenSim.Framework.Console; +using OpenSim.Servers; namespace OpenGridServices.GridServer { - public class GridHTTPServer { + public class GridHTTPServer : BaseHttpServer { public Thread HTTPD; public HttpListener Listener; - public GridHTTPServer() { + public GridHTTPServer() : base( 8001 ) { MainConsole.Instance.WriteLine("Starting up HTTP Server"); HTTPD = new Thread(new ThreadStart(StartHTTP)); HTTPD.Start(); diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 836a98b8f0..96ad76d687 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj @@ -92,6 +92,12 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False + + OpenSim.Servers + {8BB20F0A-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index 90eaf1fbf5..ece9986222 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build @@ -26,6 +26,7 @@ + diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 95f548cb5f..d10710a0f6 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj @@ -92,6 +92,12 @@ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False + + OpenSim.Servers + {8BB20F0A-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 7212a7ba4a..a4bccb8ef2 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build @@ -25,6 +25,7 @@ + diff --git a/OpenGridServices.UserServer/UserHttp.cs b/OpenGridServices.UserServer/UserHttp.cs index 6fe7fc105b..e1385f78f7 100644 --- a/OpenGridServices.UserServer/UserHttp.cs +++ b/OpenGridServices.UserServer/UserHttp.cs @@ -41,15 +41,16 @@ using OpenSim.Framework.User; using OpenSim.Framework.Sims; using OpenSim.Framework.Inventory; using OpenSim.Framework.Console; +using OpenSim.Servers; namespace OpenGridServices.UserServer { - public class UserHTTPServer + public class UserHTTPServer : BaseHttpServer { public Thread HTTPD; public HttpListener Listener; - public UserHTTPServer() + public UserHTTPServer() : base( 8002 ) { MainConsole.Instance.WriteLine("Starting up HTTP Server"); HTTPD = new Thread(new ThreadStart(StartHTTP)); diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt b/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt index 5f23222377..88f2de03aa 100644 --- a/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt +++ b/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt @@ -14,3 +14,4 @@ obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.pdb ..\bin\OpenSim.Storage.LocalStorageBerkeleyDB.dll obj\Release\ResolveAssemblyReference.cache obj\Release\OpenSim.Storage.LocalStorageBerkeleyDB.dll +..\bin\OpenSim.Storage.LocalStorageBerkeleyDB.pdb diff --git a/OpenSim.sln b/OpenSim.sln index bec8c0d7b8..875bb3b3d0 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -43,137 +43,97 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) - ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) - ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) - ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) - ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) - ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) - ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) - ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) - ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) - ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) - ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) - ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) - ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) - ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000}) - ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) - ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) - ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) - ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) - ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) - ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) - ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) - ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) - ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) - ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) - ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) - ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) - ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) - ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) - ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) - ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) - ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) - ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) - ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) - ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) - ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) - ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) - ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) - ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/bin/OpenSim.Terrain.BasicTerrain.dll b/bin/OpenSim.Terrain.BasicTerrain.dll index 729a93feb82241d433c47cf600341e89873a3cb9..817f7a851d60a9e52eec70b19382ab7230c93fed 100644 GIT binary patch literal 5632 zcmeHLYit}>75?Vo-C27#bk~WUm)kK;kQ?Kb<2Y?XOYvi!#%&xsStretWV{~R)6DKH zGwZ}|)GAaWqEe_LRUj&aC?F7(_z^@<3sN9NLTU=(Aszw>AwN(N5`v0{1V~Bv?wwhC zV}~eIRN@DBJ?EZt?z!i6&%JZU!w1en1EBM{c@ub*y=c7>-Wij!>;l=Q8a zh*&6wRNH##eb%>KkAl+IqZ}2wmh-7;y+D5rDbb4}uWZ6M6?OPY8*3l|D3bf1gR5#g zy{o4(Q|Ne_Zs-xJ2~<5PIVS}Xq$&9{rF3j)?26$K&5=r@R_MUTGUV1bHFRu1EUumu z;wQLc!aAPw=(OEQKX)W=eg`g%aOTOy^gxE71IH&cP@trTji zo`v2r6F;lfEOYZMEy|6KY3i*LdbMB`XV=G8HG8XxG{l27?2=8Xj)&3Is53(~K_t?; z;jQI(=y_Ui-Y3#BpQ5^SUFQ#wXx^7fgyAwpg7>uzYnYoXZE~B7br-9Q}#kz2--K{S3u5`uW+|e)dH4eA&Ve9FQkX&zb zbCcI9420f$?WwkMCj6Box#+oOAiL=77pILB3L>vz3z(xP!2Do?EVT!P02@K0qESiTei3rHSA zRF4KeLJvKMIP$1g$_P2mmroTJ*%P>^iv8G4>M3}{S16hiL$`!aDvuMNmGF$@d_lsC z622kfUnNYbV%B>l9Fp*qdQ^?!B?;e+UZ@Nwv;s#Qk;*}kcU`=&}O7?NnXcdFc@RRnl= z*qfMf?MEsiy-*QUXek*VaRbs+*5#fWSDW_yF7Dq8Cc)sh5BR>~Z>>@_S zpR@}VkQ2@8?9b+3w>hr8?SURJh`=WIgzaP6aos>DIx-}D|07W5+9@F9_`7 zxH~6Q?X~@YyuJ$0!tt4kJwLc)psHu4RB?)ScBoXbeXpFi{o_u-4)ExVGqIp$z$@-` z0%zQ{7kE{(12b-A#=p(Lm~TzkMaw^Sn>k*2&KHSXIyCBYg$uVCpburMG`DodfLEGy zre=IgWMk=Y&JGH`Q@;J+m{X~ZX;D&yNhZ~w&q~OUhIZSoH7l`T!RGETo6^;aGw!%f zrN-eq)hu%Mq{U1Qb17|qL1Uh;G}neGxJT^@@_fP)3`AXElJ1qPq8-(7c4!2m42DXR zo<#Ugw5_5Nj7WwtW^-$@7brD~j7I9~owZPT8HqEapUk@GZm#Jd5@_?bkyl&FN>SHl47ef)uds>OieM2WL>);#JDPekx-z^twmKT1&rA8 zl++xLda_ew$Mu$^(UMf-k%h*1U4$7%gs7p3lpa?NH5u0z1`Jcp>`L!R?-%Z7EXI*) zh{rO+nO&K~hN0?El(l+X$s`hHOfga^Ri$&tB;rsriA*A;#g$}IL3|@GLi_>uD_FOw z`+-f9o5weIc3C|eJA3Sj&7E5}THT#n$1TgU?LuKo&sHW#o~F$TG6U6ZXI^^QG`qXH zc%5ohu=b9H2}21la=2Gq560A{Cw!~C(<=?m7Hqk#SPb5YKv+2+eT#|3{Jy|Vfh}#- zZ?|8ygKugN@fPS}4SQlztIncmWJ zq!enk;8Tyo`>ai!B~0?&FWNeYSz{cv$PGAdp+Y&2RM^hx=crVnPZdfz|)g{*w`y)3fXE58#%vg{t-U4QeI@CB4ta|?K006EsG=K?fR0XW|u$Fwj)CuJE(6; zY9F9CWgbN$gHwE;i~naV<(YVyg>0f*W>I{CxYE~=Xr9Q0@U@yxLH+l9J|x#_l(sxZ zGQ(U~YO?b7^CI%mBiHCw-HTUh@j7jhbNaaM0rOa7MY+tN$!Zq0v9Q96=Lvi7NHfF# R8C`q-JEHynO8>_*@GtxpM+yJ{ literal 5632 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 - - + + + @@ -145,7 +146,8 @@ - + +