From b9c73c4859fd267cded06f44d3fe86157e5e9f3d Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 27 Mar 2007 10:40:25 +0000 Subject: * Enabled the OpenSim.Servers project --- .../OpenGridServices.GridServer.csproj | 2 +- .../OpenGridServices.UserServer.csproj | 42 ++- .../OpenGridServices.UserServer.exe.build | 1 + .../OpenSim.Config.SimConfigDb4o.csproj | 6 +- .../OpenSim.Framework.Console.csproj | 2 +- OpenSim.Framework/OpenSim.Framework.csproj | 2 +- .../Local/OpenSim.GridInterfaces.Local.csproj | 6 +- .../Remote/OpenSim.GridInterfaces.Remote.csproj | 6 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 4 +- .../Manager/OpenSim.Physics.Manager.csproj | 4 +- .../OdePlugin/OpenSim.Physics.OdePlugin.csproj | 4 +- .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | 4 +- OpenSim.RegionServer/OpenSim.RegionServer.csproj | 58 ++-- .../OpenSim.Storage.LocalStorageDb4o.csproj | 6 +- OpenSim.build | 11 +- OpenSim.sln | 146 ++++----- OpenSim/OpenSim.csproj | 10 +- Prebuild/Prebuild.sln | 10 +- Prebuild/src/Prebuild.csproj | 2 +- Servers/CapsHttpServer.cs | 332 --------------------- Servers/OpenSim.Servers.csproj | 5 +- Servers/OpenSim.Servers.dll.build | 1 - prebuild.xml | 4 +- 23 files changed, 167 insertions(+), 501 deletions(-) delete mode 100644 Servers/CapsHttpServer.cs diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 856505f..b684fe4 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {3378EE78-2D72-4C21-8F9D-680B33AAFFEE} + {50CB0968-2DB8-4293-8AC0-7543C796B88D} Debug AnyCPU diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 1b67165..bcd5077 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {36895293-A627-42EC-BA77-6AF6F5A4A7DF} + {E198DB67-006C-4E76-8D5B-8DD09E91EE2A} Debug AnyCPU - - + OpenGridServices.UserServer @@ -16,11 +15,9 @@ IE50 false Exe - - + OpenGridServices.UserServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,31 +55,30 @@ False False 4 - - + - + System.dll False - + System.Data.dll False - + System.Xml.dll False - + ..\bin\OpenSim.Framework.dll False - + ..\bin\OpenSim.Framework.Console.dll False - + ..\bin\libsecondlife.dll False @@ -93,6 +86,9 @@ + + Code + Code @@ -110,4 +106,4 @@ - \ No newline at end of file + diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 1cb35dd..f1c6180 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build @@ -11,6 +11,7 @@ + diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index 80796ea..b452cf8 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {C83C9D5B-655E-447D-90CA-7C4AB2F814DD} + {4CC1DAD6-47F0-4585-86D5-309646942564} Debug AnyCPU @@ -82,13 +82,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index bd10ce2..ab41686 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index b81afb5..7c119f2 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} Debug AnyCPU diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index e504a0a..413b9f5 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {21403281-9649-4CE8-869C-E4F2075DEE94} + {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index fe32cd6..c424896 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {BFCBC85D-2071-4294-923C-EC62D841A219} + {7C2C664B-63CD-4557-B833-1568DFB66E24} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index 23985fd..00373ad 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD} + {0BF6C279-3946-4547-AE93-F032281AD492} Debug AnyCPU @@ -70,7 +70,7 @@ OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index 0055c9c..1723397 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 7e83efd..c94ea37 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {C81B7E61-943D-4190-87C3-CB02BF67A2B3} + {B96EF3C6-4512-4D35-8FF7-91B2C9294F46} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index d2039a1..cddf5d8 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {E1510E0F-EFCB-4702-BCB6-96A084454B55} + {6102061F-756B-4864-A771-9DAA7CC05826} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index f376e04..48eb408 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {4171D545-81F5-4C64-AD29-6D7414C38181} + {C0460111-58FB-4143-89F6-FB59D187F7CE} Debug AnyCPU - - + OpenSim.RegionServer @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.RegionServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,28 +55,26 @@ False False 4 - - + - + System.dll False - - + System.Xml.dll False - + ..\bin\libsecondlife.dll False - + ..\bin\Axiom.MathLib.dll False - + ..\bin\Db4objects.Db4o.dll False @@ -90,29 +82,27 @@ OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False Code - - Code @@ -146,6 +136,12 @@ Code + + Code + + + Code + Code @@ -193,4 +189,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 1f2eb24..0a793e6 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2} + {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.build b/OpenSim.build index c61b728..b012a1b 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -46,7 +46,7 @@ - + @@ -56,16 +56,18 @@ + - + + @@ -88,7 +90,7 @@ - + @@ -98,10 +100,11 @@ + - + diff --git a/OpenSim.sln b/OpenSim.sln index 8370bef..99d9812 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,32 +1,34 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{E1510E0F-EFCB-4702-BCB6-96A084454B55}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{EAC45D69-AA44-45FB-B0CE-A95272A9B67B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{7AED7536-7D6B-4E28-8016-B5A554C663B4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{4CE50A49-7B16-49ED-961B-EC91219E6F73}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{4CC1DAD6-47F0-4585-86D5-309646942564}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{36895293-A627-42EC-BA77-6AF6F5A4A7DF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{E198DB67-006C-4E76-8D5B-8DD09E91EE2A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{BFCBC85D-2071-4294-923C-EC62D841A219}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{7C2C664B-63CD-4557-B833-1568DFB66E24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{50CB0968-2DB8-4293-8AC0-7543C796B88D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{C81B7E61-943D-4190-87C3-CB02BF67A2B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{B96EF3C6-4512-4D35-8FF7-91B2C9294F46}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{0BF6C279-3946-4547-AE93-F032281AD492}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{4171D545-81F5-4C64-AD29-6D7414C38181}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{C26F3082-76EB-46B1-8378-467A1589D62C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{C0460111-58FB-4143-89F6-FB59D187F7CE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{21403281-9649-4CE8-869C-E4F2075DEE94}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{6102061F-756B-4864-A771-9DAA7CC05826}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -34,62 +36,66 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.Build.0 = Release|Any CPU - {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.Build.0 = Release|Any CPU - {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.Build.0 = Release|Any CPU - {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.Build.0 = Release|Any CPU - {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.Build.0 = Release|Any CPU - {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.Build.0 = Release|Any CPU - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.Build.0 = Release|Any CPU - {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.Build.0 = Release|Any CPU - {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.Build.0 = Release|Any CPU - {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.Build.0 = Release|Any CPU - {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.Build.0 = Release|Any CPU - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.Build.0 = Release|Any CPU - {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.Build.0 = Release|Any CPU - {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.Build.0 = Release|Any CPU + {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Release|Any CPU.Build.0 = Release|Any CPU + {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Release|Any CPU.Build.0 = Release|Any CPU + {4CC1DAD6-47F0-4585-86D5-309646942564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CC1DAD6-47F0-4585-86D5-309646942564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CC1DAD6-47F0-4585-86D5-309646942564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CC1DAD6-47F0-4585-86D5-309646942564}.Release|Any CPU.Build.0 = Release|Any CPU + {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Release|Any CPU.Build.0 = Release|Any CPU + {7C2C664B-63CD-4557-B833-1568DFB66E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C2C664B-63CD-4557-B833-1568DFB66E24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C2C664B-63CD-4557-B833-1568DFB66E24}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C2C664B-63CD-4557-B833-1568DFB66E24}.Release|Any CPU.Build.0 = Release|Any CPU + {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Release|Any CPU.Build.0 = Release|Any CPU + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Release|Any CPU.Build.0 = Release|Any CPU + {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Release|Any CPU.Build.0 = Release|Any CPU + {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Release|Any CPU.Build.0 = Release|Any CPU + {0BF6C279-3946-4547-AE93-F032281AD492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BF6C279-3946-4547-AE93-F032281AD492}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BF6C279-3946-4547-AE93-F032281AD492}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BF6C279-3946-4547-AE93-F032281AD492}.Release|Any CPU.Build.0 = Release|Any CPU + {C26F3082-76EB-46B1-8378-467A1589D62C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C26F3082-76EB-46B1-8378-467A1589D62C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C26F3082-76EB-46B1-8378-467A1589D62C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C26F3082-76EB-46B1-8378-467A1589D62C}.Release|Any CPU.Build.0 = Release|Any CPU + {C0460111-58FB-4143-89F6-FB59D187F7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0460111-58FB-4143-89F6-FB59D187F7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0460111-58FB-4143-89F6-FB59D187F7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0460111-58FB-4143-89F6-FB59D187F7CE}.Release|Any CPU.Build.0 = Release|Any CPU + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Release|Any CPU.Build.0 = Release|Any CPU + {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Release|Any CPU.Build.0 = Release|Any CPU + {6102061F-756B-4864-A771-9DAA7CC05826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6102061F-756B-4864-A771-9DAA7CC05826}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6102061F-756B-4864-A771-9DAA7CC05826}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6102061F-756B-4864-A771-9DAA7CC05826}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index bf57515..df3ec24 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6} + {C26F3082-76EB-46B1-8378-467A1589D62C} Debug AnyCPU @@ -82,25 +82,25 @@ OpenSim.Framework - {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1} + {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {7AED7536-7D6B-4E28-8016-B5A554C663B4} + {4CE50A49-7B16-49ED-961B-EC91219E6F73} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Physics.Manager - {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348} + {F9EA091B-3231-4D1B-A068-EF4A5781A0D5} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.RegionServer - {4171D545-81F5-4C64-AD29-6D7414C38181} + {C0460111-58FB-4143-89F6-FB59D187F7CE} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 5505224..6896d2b 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU + {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index eddfe74..60c81a7 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {912F8E52-C5A0-4912-A702-D6DC3F1B4B54} + {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85} Debug AnyCPU App.ico diff --git a/Servers/CapsHttpServer.cs b/Servers/CapsHttpServer.cs deleted file mode 100644 index 1e62c81..0000000 --- a/Servers/CapsHttpServer.cs +++ /dev/null @@ -1,332 +0,0 @@ -/* -Copyright (c) OpenSimCAPS project, http://osgrid.org/ - - -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; -using System.Text; -using Nwc.XmlRpc; -using System.Threading; -using System.Text.RegularExpressions; -using System.Net; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using libsecondlife; -using OpenSim.Framework.Console; -using OpenSim.Framework.Interfaces; - -namespace OpenSim.Servers -{ - // Dummy HTTP server, does nothing useful for now - - public class CapsHttpServer - { - public Thread HTTPD; - public HttpListener Listener; - private string AdminPage; - private string NewAccountForm; - private string LoginForm; - private string passWord = "Admin"; - - public CapsHttpServer() - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server"); - HTTPD = new Thread(new ThreadStart(StartHTTP)); - HTTPD.Start(); - LoadAdminPage(); - } - - public void StartHTTP() - { - try - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK"); - Listener = new HttpListener(); - - Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/"); - Listener.Start(); - - HttpListenerContext context; - while (true) - { - context = Listener.GetContext(); - ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); - } - } - catch (Exception e) - { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message); - } - } - - private string ParseXMLRPC(string requestBody) - { - try - { - XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); - - Hashtable requestData = (Hashtable)request.Params[0]; - switch (request.MethodName) - { - case "expect_user": - AgentCircuitData agent_data = new AgentCircuitData(); - agent_data.SessionID = new LLUUID((string)requestData["session_id"]); - agent_data.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]); - agent_data.firstname = (string)requestData["firstname"]; - agent_data.lastname = (string)requestData["lastname"]; - agent_data.AgentID = new LLUUID((string)requestData["agent_id"]); - agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); - if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote") - { - ((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data); - } - return ""; - break; - } - } - catch (Exception e) - { - Console.WriteLine(e.ToString()); - } - return ""; - } - - private string ParseREST(string requestBody, string requestURL, string requestMethod) - { - string responseString = ""; - try - { - switch (requestURL) - { - case "/Admin/Accounts": - if (requestMethod == "GET") - { - responseString = "

Account management

"; - responseString += "
"; - responseString += "

Create New Account

"; - responseString += NewAccountForm; - } - break; - case "/Admin/Clients": - if (requestMethod == "GET") - { - responseString = "

Listing connected Clients

"; - OpenSim.world.Avatar TempAv; - foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) - { - if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") - { - TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID]; - responseString += "

"; - responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()); - responseString += "

"; - } - } - } - break; - case "/Admin/NewAccount": - if (requestMethod == "POST") - { - string[] comp = new string[10]; - string[] passw = new string[3]; - string delimStr = "&"; - char[] delimiter = delimStr.ToCharArray(); - string delimStr2 = "="; - char[] delimiter2 = delimStr2.ToCharArray(); - - //Console.WriteLine(requestBody); - comp = requestBody.Split(delimiter); - passw = comp[3].Split(delimiter2); - if (passw[1] == passWord) - { - responseString = "

New Account created

"; - } - else - { - responseString = "

Admin password is incorrect, please login with the correct password

"; - responseString += "

" + LoginForm; - } - } - break; - case "/Admin/Login": - if (requestMethod == "POST") - { - // Console.WriteLine(requestBody); - if (requestBody == passWord) - { - responseString = "

Login Successful

"; - } - else - { - responseString = "

Password Error

"; - responseString += "

Please Login with the correct password

"; - responseString += "

" + LoginForm; - } - } - break; - case "/Admin/Welcome": - if (requestMethod == "GET") - { - responseString = "Welcome to the OpenSim Admin Page"; - responseString += "


" + LoginForm; - - } - break; - } - } - catch (Exception e) - { - Console.WriteLine(e.ToString()); - } - - return responseString; - } - - private string ParseLLSDXML(string requestBody) - { - // dummy function for now - IMPLEMENT ME! - return ""; - } - - public void HandleRequest(Object stateinfo) - { - // Console.WriteLine("new http incoming"); - HttpListenerContext context = (HttpListenerContext)stateinfo; - - HttpListenerRequest request = context.Request; - HttpListenerResponse response = context.Response; - - response.KeepAlive = false; - response.SendChunked = false; - - System.IO.Stream body = request.InputStream; - System.Text.Encoding encoding = System.Text.Encoding.UTF8; - System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding); - - string requestBody = reader.ReadToEnd(); - body.Close(); - reader.Close(); - - //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType); - //Console.WriteLine(requestBody); - - string responseString = ""; - switch (request.ContentType) - { - case "text/xml": - // must be XML-RPC, so pass to the XML-RPC parser - - responseString = ParseXMLRPC(requestBody); - response.AddHeader("Content-type", "text/xml"); - break; - - case "application/xml": - // probably LLSD we hope, otherwise it should be ignored by the parser - responseString = ParseLLSDXML(requestBody); - response.AddHeader("Content-type", "application/xml"); - break; - - case "application/x-www-form-urlencoded": - // a form data POST so send to the REST parser - responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); - response.AddHeader("Content-type", "text/html"); - break; - - case null: - if ((request.HttpMethod == "GET") && (request.RawUrl == "/Admin")) - { - responseString = AdminPage; - response.AddHeader("Content-type", "text/html"); - } - else - { - // must be REST or invalid crap, so pass to the REST parser - responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); - response.AddHeader("Content-type", "text/html"); - } - break; - - } - - byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString); - System.IO.Stream output = response.OutputStream; - response.SendChunked = false; - response.ContentLength64 = buffer.Length; - output.Write(buffer, 0, buffer.Length); - output.Close(); - } - - private void LoadAdminPage() - { - try - { - StreamReader SR; - string lines; - AdminPage = ""; - NewAccountForm = ""; - LoginForm = ""; - SR = File.OpenText("testadmin.htm"); - - while (!SR.EndOfStream) - { - lines = SR.ReadLine(); - AdminPage += lines + "\n"; - - } - SR.Close(); - - SR = File.OpenText("newaccountform.htm"); - - while (!SR.EndOfStream) - { - lines = SR.ReadLine(); - NewAccountForm += lines + "\n"; - - } - SR.Close(); - - SR = File.OpenText("login.htm"); - - while (!SR.EndOfStream) - { - lines = SR.ReadLine(); - LoginForm += lines + "\n"; - - } - SR.Close(); - } - catch (Exception e) - { - Console.WriteLine(e.ToString()); - } - - } - } - - -} diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj index 9c66943..bc386fd 100644 --- a/Servers/OpenSim.Servers.csproj +++ b/Servers/OpenSim.Servers.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {A8E12EC9-CB2F-4D25-AFD0-626BF2162F5D} + {EAC45D69-AA44-45FB-B0CE-A95272A9B67B} Debug AnyCPU @@ -82,9 +82,6 @@ - - Code - diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build index 1321629..1d6b315 100644 --- a/Servers/OpenSim.Servers.dll.build +++ b/Servers/OpenSim.Servers.dll.build @@ -11,7 +11,6 @@ - diff --git a/prebuild.xml b/prebuild.xml index ee8a2ac..d1030af 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -95,7 +95,7 @@ - + -- cgit v1.1