33 files changed, 40 insertions, 1005 deletions
diff --git a/ogs/OGS-UserServer.sln b/OGS/OGS.sln
index 6c98af1..20eb03a 100644
--- a/ogs/OGS-UserServer.sln
+++ b/OGS/OGS.sln
@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-UserServer", "userserver\src\OGS-UserServer.csproj", "{D45B6E48-5668-478D-B9CB-6D46E665FACF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerConsole", "ServerConsole\ServerConsole.csproj", "{7667E6E2-F227-41A2-B1B2-315613E1BAFC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OGS-GridServer", "gridserver\src\OGS-GridServer.csproj", "{FE50A574-C8ED-433B-95F0-213A5EED2AB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "..\OpenSim.FrameWork\OpenSim.Framework.csproj", "{2E46A825-3168-492F-93BC-637126B5B72B}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,14 +19,18 @@ Global
                {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {D45B6E48-5668-478D-B9CB-6D46E665FACF}.Release|Any CPU.Build.0 = Release|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {FE50A574-C8ED-433B-95F0-213A5EED2AB2}.Release|Any CPU.Build.0 = Release|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {7667E6E2-F227-41A2-B1B2-315613E1BAFC}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2E46A825-3168-492F-93BC-637126B5B72B}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/ogs/ServerConsole/Properties/AssemblyInfo.cs b/OGS/ServerConsole/Properties/AssemblyInfo.cs
index 0028e2a..0028e2a 100644
--- a/ogs/ServerConsole/Properties/AssemblyInfo.cs
+++ b/OGS/ServerConsole/Properties/AssemblyInfo.cs
diff --git a/ogs/ServerConsole/ServerConsole.cs b/OGS/ServerConsole/ServerConsole.cs
index d50a7e2..d50a7e2 100644
--- a/ogs/ServerConsole/ServerConsole.cs
+++ b/OGS/ServerConsole/ServerConsole.cs
diff --git a/ogs/ServerConsole/ServerConsole.csproj b/OGS/ServerConsole/ServerConsole.csproj
index 7f3005e..d23ca52 100644
--- a/ogs/ServerConsole/ServerConsole.csproj
+++ b/OGS/ServerConsole/ServerConsole.csproj
@@ -9,8 +9,6 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>ServerConsole</RootNamespace>
    <AssemblyName>ServerConsole</AssemblyName>
-    <StartupObject>
-    </StartupObject>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -39,11 +37,4 @@
    <Compile Include="ServerConsole.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
 \ No newline at end of file
diff --git a/ogs/ServerConsole/default.build b/OGS/ServerConsole/default.build
index 64a4f04..64a4f04 100644
--- a/ogs/ServerConsole/default.build
+++ b/OGS/ServerConsole/default.build
diff --git a/ogs/common/VersionInfo/VersionInfo.cs b/OGS/common/VersionInfo/VersionInfo.cs
index 9763e62..9763e62 100644
--- a/ogs/common/VersionInfo/VersionInfo.cs
+++ b/OGS/common/VersionInfo/VersionInfo.cs
diff --git a/ogs/common/bin/libsecondlife.dll b/OGS/common/bin/libsecondlife.dll
index 89d692a..89d692a 100755..100644
--- a/ogs/common/bin/libsecondlife.dll
+++ b/OGS/common/bin/libsecondlife.dll
Binary files differ
diff --git a/ogs/common/src/OGS-Console.cs b/OGS/common/src/OGS-Console.cs
index c35c75c..c35c75c 100644
--- a/ogs/common/src/OGS-Console.cs
+++ b/OGS/common/src/OGS-Console.cs
diff --git a/ogs/common/src/VersionInfo.cs.template b/OGS/common/src/VersionInfo.cs.template
index 8f73b4b..8f73b4b 100644
--- a/ogs/common/src/VersionInfo.cs.template
+++ b/OGS/common/src/VersionInfo.cs.template
diff --git a/ogs/gridserver/default.build b/OGS/gridserver/default.build
index b113b83..b113b83 100644
--- a/ogs/gridserver/default.build
+++ b/OGS/gridserver/default.build
diff --git a/ogs/gridserver/src/ConsoleCmds.cs b/OGS/gridserver/src/ConsoleCmds.cs
index 82a2279..82a2279 100644
--- a/ogs/gridserver/src/ConsoleCmds.cs
+++ b/OGS/gridserver/src/ConsoleCmds.cs
diff --git a/ogs/gridserver/src/GridHttp.cs b/OGS/gridserver/src/GridHttp.cs
index 833a8ac..496a3bc 100644
--- a/ogs/gridserver/src/GridHttp.cs
+++ b/OGS/gridserver/src/GridHttp.cs
@@ -38,6 +38,7 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using ServerConsole;
+using OpenSim.Framework.Sims;
 namespace OpenGridServices
 {
@@ -73,7 +74,7 @@ namespace OpenGridServices
                        switch(request.MethodName) {
                                case "get_sim_info":
                                        ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);
-                                        SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
+                                        SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
                                        string RecvKey="";
                                        string caller=(string)requestData["caller"];
                                        switch(caller) {
diff --git a/ogs/gridserver/src/Main.cs b/OGS/gridserver/src/Main.cs
index d29a1ae..d29a1ae 100644
--- a/ogs/gridserver/src/Main.cs
+++ b/OGS/gridserver/src/Main.cs
diff --git a/ogs/gridserver/src/OGS-GridServer.csproj b/OGS/gridserver/src/OGS-GridServer.csproj
index d984e9a..b957d40 100644
--- a/ogs/gridserver/src/OGS-GridServer.csproj
+++ b/OGS/gridserver/src/OGS-GridServer.csproj
@@ -40,9 +40,6 @@
    <Compile Include="..\..\common\src\OGS-Console.cs">
      <Link>OGS-Console.cs</Link>
    </Compile>
-    <Compile Include="..\..\common\src\Util.cs">
-      <Link>Util.cs</Link>
-    </Compile>
    <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
      <Link>VersionInfo.cs</Link>
    </Compile>
@@ -53,17 +50,14 @@
    <Compile Include="SimProfiles.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
+      <Name>OpenSim.Framework</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
      <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
      <Name>ServerConsole</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
 \ No newline at end of file
diff --git a/ogs/gridserver/src/Properties/AssemblyInfo.cs b/OGS/gridserver/src/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/ogs/gridserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/gridserver/src/Properties/AssemblyInfo.cs
diff --git a/ogs/gridserver/src/SimProfiles.cs b/OGS/gridserver/src/SimProfiles.cs
index 91a92ea..6db8331 100644
--- a/ogs/gridserver/src/SimProfiles.cs
+++ b/OGS/gridserver/src/SimProfiles.cs
@@ -33,6 +33,8 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using ServerConsole;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Sims;
 namespace OpenGridServices
 {
@@ -40,7 +42,7 @@ namespace OpenGridServices
        /// </summary>
        public class SimProfileManager {
        
-                public Dictionary<LLUUID, SimProfile> SimProfiles = new Dictionary<LLUUID, SimProfile>();
+                public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();
                public SimProfileManager() {
                }
@@ -49,19 +51,19 @@ namespace OpenGridServices
                        // TODO: need to load from database
                }
-                public SimProfile GetProfileByHandle(ulong reqhandle) {
+                public SimProfileBase GetProfileByHandle(ulong reqhandle) {
                        foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
                                if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];
                        }
                        return null;
                }
-                public SimProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) {
+                public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) {
                        return SimProfiles[ProfileLLUUID];
                }
        
                public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {
-                        SimProfile TheSim=GetProfileByHandle(regionhandle);
+                        SimProfileBase TheSim=GetProfileByHandle(regionhandle);
                        if(TheSim != null) 
                        if(TheSim.recvkey==simrecvkey) {
                                return true;
@@ -71,8 +73,8 @@ namespace OpenGridServices
                        
                }
-                public SimProfile CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
+                public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
-                        SimProfile newprofile = new SimProfile();
+                        SimProfileBase newprofile = new SimProfileBase();
                        newprofile.regionname=regionname;
                        newprofile.sim_ip=sim_ip;
                        newprofile.sim_port=sim_port;
@@ -89,7 +91,8 @@ namespace OpenGridServices
        }
-        public class SimProfile {
+    /*  is in OpenSim.Framework
+        public class SimProfileBase {
                public LLUUID UUID;
                public ulong regionhandle;
                public string regionname;
@@ -102,10 +105,10 @@ namespace OpenGridServices
                public string recvkey;
                
        
-                public SimProfile() {
+                public SimProfileBase() {
                }
        
        
-        }
+        }*/
 }
diff --git a/ogs/userserver/src/ConsoleCmds.cs b/OGS/userserver/src/ConsoleCmds.cs
index f2568fc..f2568fc 100644
--- a/ogs/userserver/src/ConsoleCmds.cs
+++ b/OGS/userserver/src/ConsoleCmds.cs
diff --git a/ogs/userserver/src/Main.cs b/OGS/userserver/src/Main.cs
index 40ef916..7e5308e 100644
--- a/ogs/userserver/src/Main.cs
+++ b/OGS/userserver/src/Main.cs
@@ -33,6 +33,9 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using ServerConsole;
+using OpenSim.Framework.User;
+using OpenSim.Framework.Sims;
+using OpenSim.Framework.Inventory;
 namespace OpenGridServices
 {
@@ -73,16 +76,17 @@ namespace OpenGridServices
                public void Startup() {
                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
-                        this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");
+            this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");
                        this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: ");
                        this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: ");
                
                        this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");
+           
                        ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");
                        _profilemanager = new UserProfileManager();
                        _profilemanager.InitUserProfiles();
-        
+            _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg);
                
                        string tempfirstname;
                        string templastname;
diff --git a/ogs/userserver/src/OGS-UserServer.csproj b/OGS/userserver/src/OGS-UserServer.csproj
index f6737c8..f4fa8b6 100644
--- a/ogs/userserver/src/OGS-UserServer.csproj
+++ b/OGS/userserver/src/OGS-UserServer.csproj
@@ -48,21 +48,16 @@
    <Compile Include="Main.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="UserHttp.cs" />
-    <Compile Include="UserProfiles.cs" />
-    <Compile Include="Util.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
+      <Name>OpenSim.Framework</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
      <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
      <Name>ServerConsole</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
 \ No newline at end of file
diff --git a/ogs/userserver/src/OGS-UserServer.csproj.user b/OGS/userserver/src/OGS-UserServer.csproj.user
index 9c0b2d9..aa75a3d 100644
--- a/ogs/userserver/src/OGS-UserServer.csproj.user
+++ b/OGS/userserver/src/OGS-UserServer.csproj.user
@@ -1,14 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PublishUrlHistory>publish\</PublishUrlHistory>
-    <InstallUrlHistory>
-    </InstallUrlHistory>
-    <SupportUrlHistory>
-    </SupportUrlHistory>
-    <UpdateUrlHistory>
-    </UpdateUrlHistory>
-    <BootstrapperUrlHistory>
-    </BootstrapperUrlHistory>
    <ApplicationRevision>0</ApplicationRevision>
    <FallbackCulture>en-US</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
diff --git a/ogs/userserver/src/Properties/AssemblyInfo.cs b/OGS/userserver/src/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/ogs/userserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/userserver/src/Properties/AssemblyInfo.cs
diff --git a/ogs/assetserver/assets/00000000000000005005000000000005/data b/ogs/assetserver/assets/00000000000000005005000000000005/data
deleted file mode 100644
index e6840e2..0000000
--- a/ogs/assetserver/assets/00000000000000005005000000000005/data
+++ /dev/null
Binary files differ
diff --git a/ogs/assetserver/assets/00000000000000007007000000000006/data b/ogs/assetserver/assets/00000000000000007007000000000006/data
deleted file mode 100644
index 5ad1fd0..0000000
--- a/ogs/assetserver/assets/00000000000000007007000000000006/data
+++ /dev/null
Binary files differ
diff --git a/ogs/assetserver/assets/00000000000000007009000000000008/data b/ogs/assetserver/assets/00000000000000007009000000000008/data
deleted file mode 100644
index cd2fd94..0000000
--- a/ogs/assetserver/assets/00000000000000007009000000000008/data
+++ /dev/null
Binary files differ
diff --git a/ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data b/ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data
deleted file mode 100644
index 920c775..0000000
--- a/ogs/assetserver/assets/66c41e3938f9f75a024e585989bfab73/data
+++ /dev/null
@@ -1,105 +0,0 @@
-LLWearable version 22
-Female Shape and Outfit 3 Shape
-Created by system from avatar's appearance.
-        permissions 0
-        {
-                base_mask       00082000
-                owner_mask      00082000
-                group_mask      00082000
-                everyone_mask   00082000
-                next_owner_mask 00082000
-                creator_id      3d924400-038e-6ad9-920b-cfbb9b40585c
-                owner_id        542ffb8e-8932-49b9-8664-58f53e442797
-                last_owner_id   3d924400-038e-6ad9-920b-cfbb9b40585c
-                group_id        00000000-0000-0000-0000-000000000000
-        }
-        sale_info       0
-        {
-                sale_type       not
-                sale_price      0
-        }
-type 0
-parameters 82
-1 .21
-2 -.5
-4 -.11
-5 -.1
-6 -.3
-7 -.4
-8 -.5
-10 .7
-11 .34
-12 -.5
-13 0
-14 .04
-15 .58
-17 .56
-18 -.26
-19 -.73
-20 -.34
-21 -.01
-22 1
-23 -.5
-24 -.63
-25 .44
-27 .05
-33 -.24
-34 -.7
-35 -.16
-36 -.2
-37 -.98
-38 -.5
-80 0
-105 .07
-155 -.22
-157 0
-185 -1
-193 .86
-196 -.74
-505 .65
-506 .12
-507 -1.5
-515 0
-517 .16
-518 .8
-629 0
-637 0
-646 .4
-647 1
-649 .36
-650 .85
-652 .49
-653 -1
-656 0
-659 .65
-662 .5
-663 0
-664 0
-665 0
-675 -.15
-676 .26
-678 .28
-682 .27
-683 -.19
-684 -.09
-685 0
-690 .45
-692 .4
-693 -0
-753 -.5
-756 -.08
-758 .24
-759 .6
-760 .11
-764 -.38
-765 -.3
-769 .42
-773 .51
-795 .16
-796 .11
-799 .36
-841 0
-842 -.82
-879 0
-880 0
-textures 0
diff --git a/ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data b/ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data
deleted file mode 100644
index 95cc683..0000000
--- a/ogs/assetserver/assets/e0ee49b5a4184df8d3c9a65361fe7f49/data
+++ /dev/null
@@ -1,52 +0,0 @@
-LLWearable version 22
-Sexy - Female Skin
-        permissions 0
-        {
-                base_mask       00086000
-                owner_mask      00086000
-                group_mask      00000000
-                everyone_mask   00000000
-                next_owner_mask 00086000
-                creator_id      3b659a92-dbf0-4301-8fdc-208d78f00d77
-                owner_id        3d924400-038e-6ad9-920b-cfbb9b40585c
-                last_owner_id   101358d5-469d-4b24-9b85-4dc3c05e635d
-                group_id        00000000-0000-0000-0000-000000000000
-        }
-        sale_info       0
-        {
-                sale_type       not
-                sale_price      10
-        }
-type 1
-parameters 26
-108 0
-110 0
-111 0
-116 0
-117 1
-150 0
-162 0
-163 0
-165 0
-700 .01
-701 .5
-702 .26
-703 0
-704 0
-705 .5
-706 .6
-707 0
-708 0
-709 0
-710 0
-711 .5
-712 0
-713 .7
-714 0
-715 0
-775 0
-textures 3
-0 f9261672-5058-9ef8-c0c4-48f43a0b16d4
-5 b6ba53be-b5bf-9a1f-2e19-21daf998429c
-6 703f6e24-a1fb-1980-acaf-6ab8a99a5bd5
diff --git a/ogs/common/src/Util.cs b/ogs/common/src/Util.cs
deleted file mode 100644
index 1efa471..0000000
--- a/ogs/common/src/Util.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* Copyright (c) <year>, <copyright holder>
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenGridServices
-{
-        /// <summary>
-        /// </summary>
-        /// 
-                public class Util
-                {
-                        public static ulong UIntsToLong(uint X, uint Y)
-                        {
-                                return Helpers.UIntsToLong(X,Y);
-                        }
-                        public Util()
-                        {
-                                
-                        }
-                }
-                
-        public class QueItem {
-                public QueItem()
-                {
-                }
-                public Packet Packet;
-                public bool Incoming;
-        }
-        public class BlockingQueue< T > {
-                private Queue< T > _queue = new Queue< T >();
-                private object _queueSync = new object();
-                public void Enqueue(T value)
-                {
-                        lock(_queueSync)
-                        {
-                                _queue.Enqueue(value);
-                                Monitor.Pulse(_queueSync);
-                        }
-                }
-                public T Dequeue()
-                {
-                        lock(_queueSync)
-                        {
-                                if( _queue.Count < 1)
-                                        Monitor.Wait(_queueSync);
-                                return _queue.Dequeue();
-                        }
-                }
-        }
-}
diff --git a/ogs/genvers.sh b/ogs/genvers.sh
deleted file mode 100644
index 8d8007c..0000000
--- a/ogs/genvers.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-MAJOR=0
-MINOR=1
-BUILD=`date +%s`
-REVISION=`svnversion . | sed s/:// | sed s/M//`
-REALREVISION=`svnversion`
-cat common/src/VersionInfo.cs.template | sed s/@@VERSION/"$MAJOR.$MINOR, Build $BUILD, Revision $REALREVISION"/g >common/src/VersionInfo.cs
-echo -n $MAJOR.$MINOR.*.$REVISION >VERSION
diff --git a/ogs/ogs.build b/ogs/ogs.build
deleted file mode 100644
index 303b1bf..0000000
--- a/ogs/ogs.build
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-    <project name="OGS" default="build" basedir=".">
-        <description>nant buildfile for OpenSim</description>
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-        <nant target="clean">
-                <buildfiles>
-                        <include name="ServerConsole/default.build" />
-                        <include name="gridserver/default.build" />
-                </buildfiles>
-        </nant>
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        <exec program="genvers.sh" />
-        <loadfile file="VERSION" property="svnver"/>
-        <nant>
-                <buildfiles>
-                        <include name="ServerConsole/default.build" />
-                        <include name="gridserver/default.build" />
-                </buildfiles>
-        </nant>
-        </target>
-</project>
diff --git a/ogs/userserver/default.build b/ogs/userserver/default.build
deleted file mode 100644
index a56f925..0000000
--- a/ogs/userserver/default.build
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-    <project name="UserServer" default="build" basedir="./">
-        <property name="debug" value="true" overwrite="false" />
-        <target name="clean" description="remove all generated files">
-                <delete>
-                        <fileset failonempty="false">
-                                <include name="bin/*.dll" />
-                                <include name="bin/*.exe" />
-                                <include name="bin/*.mdb" />
-                        </fileset>
-                </delete>
-        </target>
-        <target name="svnupdate" description="updates to latest SVN">
-                <exec program="svn">
-                        <arg value="update" />
-                </exec>
-        </target>
-        <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
-                
-        </target>
-        
-        <target name="build" description="compiles the source code">
-        
-        <loadfile file="../VERSION" property="svnver"/>
-        <asminfo output="src/AssemblyInfo.cs" language="CSharp">
-                <imports>
-                        <import namespace="System" />
-                        <import namespace="System.Reflection" />
-                        <import namespace="System.Runtime.InteropServices" />
-                </imports>
-                <attributes>
-                        <attribute type="ComVisibleAttribute" value="false" />
-                        <attribute type="CLSCompliantAttribute" value="false" />
-                        <attribute type="AssemblyVersionAttribute" value="${svnver}" />
-                        <attribute type="AssemblyTitleAttribute" value="ogs-UserServer" />
-                        <attribute type="AssemblyDescriptionAttribute" value="The core OGS User Server" />
-                        <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
-                </attributes>
-        </asminfo>
-        <csc target="exe" output="bin/UserServer.exe" debug="${debug}" verbose="true" warninglevel="4">
-                        <references failonempty="true">
-                                <include name="System" />
-                                <include name="System.Xml" />
-                                <include name="../common/bin/ServerConsole.dll" />
-                                <include name="../common/bin/libsecondlife.dll" />
-                        </references>
-                        <sources>
-                                <include name="../common/src/VersionInfo.cs" />
-                                <include name="../common/src/OGS-Console.cs" />
-                                <include name="src/*.cs" />
-                        </sources>
-        </csc>
-        
-        <copy todir="bin/">
-                <fileset basedir="../common/bin">
-                        <include name="*.*" />
-                </fileset>
-        </copy>
-        </target>
-</project>
diff --git a/ogs/userserver/src/UserHttp.cs b/ogs/userserver/src/UserHttp.cs
deleted file mode 100644
index bc232fb..0000000
--- a/ogs/userserver/src/UserHttp.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-Copyright (c) OpenGrid 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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 ServerConsole;
-namespace OpenGridServices
-{
-        public class UserHTTPServer {
-                public Thread HTTPD;
-                public HttpListener Listener;
-        
-                public UserHTTPServer() {
-                        ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
-                        HTTPD = new Thread(new ThreadStart(StartHTTP));
-                        HTTPD.Start();
-                }
-                public void StartHTTP() {
-                        ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK");
-                        Listener = new HttpListener();
-                        Listener.Prefixes.Add("http://+:8002/userserver/");
-                        Listener.Prefixes.Add("http://+:8002/usersessions/");
-                        Listener.Start();
-                        HttpListenerContext context;
-                        while(true) {
-                                context = Listener.GetContext();
-                                ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
-                        }
-                }
-                static string ParseXMLRPC(string requestBody) {
-                        XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
-                
-                        Hashtable requestData = (Hashtable)request.Params[0];
-                        switch(request.MethodName) {
-                                case "login_to_simulator":
-                                        bool GoodXML= (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
-                                        bool GoodLogin=false;
-                                        string firstname="";
-                                        string lastname="";
-                                        string passwd="";
-                                        
-                                        if(GoodXML) {
-                                                firstname=(string)requestData["first"];
-                                                lastname=(string)requestData["last"];
-                                                passwd=(string)requestData["passwd"];
-                                                GoodLogin=OpenUser_Main.userserver._profilemanager.AuthenticateUser(firstname,lastname,passwd);
-                                        }
-                                        
-                                        if(!(GoodXML && GoodLogin)) {
-                                                XmlRpcResponse LoginErrorResp = new XmlRpcResponse();
-                                                Hashtable ErrorRespData = new Hashtable();
-                                                ErrorRespData["reason"]="key";
-                                                ErrorRespData["message"]="Error connecting to grid. Please double check your login details and check with the grid owner if you are sure these are correct";
-                                                ErrorRespData["login"]="false";
-                                                LoginErrorResp.Value=ErrorRespData;
-                                                return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(LoginErrorResp)," encoding=\"utf-16\"","" ));
-                                        } 
-                                        
-                                        UserProfile TheUser=OpenUser_Main.userserver._profilemanager.GetProfileByName(firstname,lastname);
-                                        
-                                        if(!((TheUser.CurrentSessionID==null) && (TheUser.CurrentSecureSessionID==null))) {
-                                                XmlRpcResponse PresenceErrorResp = new XmlRpcResponse();
-                                                Hashtable PresenceErrorRespData = new Hashtable();
-                                                PresenceErrorRespData["reason"]="presence";
-                                                PresenceErrorRespData["message"]="You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner";
-                                                PresenceErrorRespData["login"]="false";
-                                                PresenceErrorResp.Value=PresenceErrorRespData;
-                                                return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(PresenceErrorResp)," encoding=\"utf-16\"","" ));
-                                        }
-                                        
-                                try {   
-                                        LLUUID AgentID = TheUser.UUID;
-                                        TheUser.InitSessionData();
-                                        SimProfile SimInfo = new SimProfile();
-                                        SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle,OpenUser_Main.userserver.GridURL,OpenUser_Main.userserver.GridSendKey,OpenUser_Main.userserver.GridRecvKey);
-                                        XmlRpcResponse LoginGoodResp = new XmlRpcResponse();
-                                        Hashtable LoginGoodData = new Hashtable();
-                                
-                                        Hashtable GlobalT = new Hashtable();
-                                        GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
-                                        GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                                        GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
-                                        ArrayList GlobalTextures = new ArrayList();
-                                        GlobalTextures.Add(GlobalT);
-                                        Hashtable LoginFlagsHash = new Hashtable();
-                                        LoginFlagsHash["daylight_savings"]="N";
-                                        LoginFlagsHash["stipend_since_login"]="N";
-                                        LoginFlagsHash["gendered"]="Y";
-                                        LoginFlagsHash["ever_logged_in"]="Y";
-                                        ArrayList LoginFlags=new ArrayList();
-                                        LoginFlags.Add(LoginFlagsHash);
-                                        Hashtable uiconfig = new Hashtable();
-                                        uiconfig["allow_first_life"]="Y";
-                                        ArrayList ui_config=new ArrayList();
-                                        ui_config.Add(uiconfig);
-                                        
-                                        Hashtable ClassifiedCategoriesHash = new Hashtable();
-                                        ClassifiedCategoriesHash["category_name"]="bla bla";
-                                        ClassifiedCategoriesHash["category_id"]=(Int32)1;
-                                        ArrayList ClassifiedCategories = new ArrayList();
-                                        ClassifiedCategories.Add(ClassifiedCategoriesHash);
-                                
-                                        ArrayList AgentInventory = new ArrayList();
-                                        foreach(InventoryFolder InvFolder in TheUser.InventoryFolders.Values) {
-                                                Hashtable TempHash = new Hashtable();
-                                                TempHash["name"]=InvFolder.FolderName;
-                                                TempHash["parent_id"]=InvFolder.ParentID.ToStringHyphenated();
-                                                TempHash["version"]=(Int32)InvFolder.Version;
-                                                TempHash["type_default"]=(Int32)InvFolder.DefaultType;
-                                                TempHash["folder_id"]=InvFolder.FolderID.ToStringHyphenated();
-                                                AgentInventory.Add(TempHash);
-                                        }
-                                        Hashtable InventoryRootHash = new Hashtable();
-                                        InventoryRootHash["folder_id"]=TheUser.InventoryRoot.FolderID.ToStringHyphenated();
-                                        ArrayList InventoryRoot = new ArrayList();
-                                        InventoryRoot.Add(InventoryRootHash);
-                                        
-                                        Hashtable InitialOutfitHash = new Hashtable();
-                                        InitialOutfitHash["folder_name"]="Nightclub Female";
-                                        InitialOutfitHash["gender"]="female";
-                                        ArrayList InitialOutfit = new ArrayList();
-                                        InitialOutfit.Add(InitialOutfitHash);
-                                        uint circode = (uint)(new Random()).Next();
-                                        TheUser.AddSimCircuit(circode, SimInfo.UUID);
-                                        LoginGoodData["last_name"]="\"" + TheUser.firstname + "\"";
-                                        LoginGoodData["ui-config"]=ui_config;
-                                        LoginGoodData["sim_ip"]=SimInfo.sim_ip.ToString();
-                                        LoginGoodData["login-flags"]=LoginFlags;
-                                        LoginGoodData["global-textures"]=GlobalTextures;
-                                        LoginGoodData["classified_categories"]=ClassifiedCategories;
-                                        LoginGoodData["event_categories"]=new ArrayList();
-                                        LoginGoodData["inventory-skeleton"]=AgentInventory;
-                                        LoginGoodData["inventory-skel-lib"]=new ArrayList();
-                                        LoginGoodData["inventory-root"]=InventoryRoot;
-                                        LoginGoodData["event_notifications"]=new ArrayList();
-                                        LoginGoodData["gestures"]=new ArrayList();
-                                        LoginGoodData["inventory-lib-owner"]=new ArrayList();
-                                        LoginGoodData["initial-outfit"]=InitialOutfit;
-                                        LoginGoodData["seconds_since_epoch"]=(Int32)(DateTime.UtcNow - new DateTime(1970,1,1)).TotalSeconds;
-                                        LoginGoodData["start_location"]="last";
-                                        LoginGoodData["home"]="{'region_handle':[r" + (SimInfo.RegionLocX*256).ToString() + ",r" + (SimInfo.RegionLocY*256).ToString() + "], 'position':[r" + TheUser.homepos.X.ToString() + ",r" + TheUser.homepos.Y.ToString() + ",r" + TheUser.homepos.Z.ToString() + "], 'look_at':[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]}";
-                                        LoginGoodData["message"]=OpenUser_Main.userserver.DefaultStartupMsg;
-                                        LoginGoodData["first_name"]="\"" + firstname + "\"";
-                                        LoginGoodData["circuit_code"]=(Int32)circode;
-                                        LoginGoodData["sim_port"]=(Int32)SimInfo.sim_port;
-                                        LoginGoodData["secure_session_id"]=TheUser.CurrentSecureSessionID.ToStringHyphenated();
-                                        LoginGoodData["look_at"]="\n[r" + TheUser.homelookat.X.ToString() + ",r" + TheUser.homelookat.Y.ToString() + ",r" + TheUser.homelookat.Z.ToString() + "]\n";
-                                        LoginGoodData["agent_id"]=AgentID.ToStringHyphenated();
-                                        LoginGoodData["region_y"]=(Int32)SimInfo.RegionLocY*256;
-                                        LoginGoodData["region_x"]=(Int32)SimInfo.RegionLocX*256;
-                                        LoginGoodData["seed_capability"]=null;
-                                        LoginGoodData["agent_access"]="M";
-                                        LoginGoodData["session_id"]=TheUser.CurrentSessionID.ToStringHyphenated();
-                                        LoginGoodData["login"]="true";
-        
-                                        LoginGoodResp.Value=LoginGoodData;
-                                        TheUser.SendDataToSim(SimInfo);
-                                        return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(LoginGoodResp),"utf-16","utf-8" ));
-                                } catch (Exception E) {
-                                        Console.WriteLine(E.ToString());
-                                }                                       
-                                        
-                                break;
-                        }
-                        return "";
-                }
-                
-                static string ParseREST(HttpListenerRequest www_req) {
-                        Console.WriteLine("INCOMING REST - " + www_req.RawUrl);
-        
-                        char[] splitter  = {'/'};
-                        string[] rest_params = www_req.RawUrl.Split(splitter);
-                        string req_type = rest_params[1];       // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla
-                        switch(req_type) {
-                                case "usersessions":
-                                        LLUUID sessionid = new LLUUID(rest_params[2]);  // get usersessions/sessionid
-                                        if(www_req.HttpMethod=="DELETE") {
-                                                foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) {
-                                                        if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) {
-                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null;
-                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null;
-                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear();
-                                                        }
-                                                }
-                                        }
-                                        return "OK";
-                                break;
-                        }
-                        return "";
-                }
-                static void HandleRequest(Object  stateinfo) {
-                        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();
-                        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 "text/plaintext":
-                                        responseString=ParseREST(request);
-                                        response.AddHeader("Content-type","text/plaintext");
-                                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();
-                }
-        }
-}
diff --git a/ogs/userserver/src/UserProfiles.cs b/ogs/userserver/src/UserProfiles.cs
deleted file mode 100644
index 4586ab3..0000000
--- a/ogs/userserver/src/UserProfiles.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-Copyright (c) OpenGrid 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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 System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-using Nwc.XmlRpc;
-using ServerConsole;
-namespace OpenGridServices
-{
-        /// <summary>
-        /// </summary>
-        public class UserProfileManager {
-        
-                public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>();
-                public UserProfileManager() {
-                }
-                
-                public void InitUserProfiles() {
-                        // TODO: need to load from database
-                }
-                public UserProfile GetProfileByName(string firstname, string lastname) {
-                        foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys) {
-                                if((UserProfiles[UUID].firstname==firstname) && (UserProfiles[UUID].lastname==lastname)) return UserProfiles[UUID];
-                        }
-                        return null;
-                }
-                public UserProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) {
-                        return UserProfiles[ProfileLLUUID];
-                }
-        
-                public bool AuthenticateUser(string firstname, string lastname, string passwd) {
-                        UserProfile TheUser=GetProfileByName(firstname, lastname);
-                        if(TheUser != null) 
-                        if(TheUser.MD5passwd==passwd) {
-                                return true;
-                        } else {
-                                return false;
-                        } else return false;
-                        
-                }
-                public void SetGod(LLUUID GodID) {
-                        this.UserProfiles[GodID].IsGridGod=true;
-                }
-                public UserProfile CreateNewProfile(string firstname, string lastname, string MD5passwd) {
-                        UserProfile newprofile = new UserProfile();
-                        newprofile.homeregionhandle=Util.UIntsToLong((997*256), (996*256));
-                        newprofile.firstname=firstname;
-                        newprofile.lastname=lastname;
-                        newprofile.MD5passwd=MD5passwd;
-                        newprofile.UUID=LLUUID.Random();                        
-                        this.UserProfiles.Add(newprofile.UUID,newprofile);
-                        return newprofile;
-                }
-        }
-        public class UserProfile {
-        
-                public string firstname;
-                public string lastname;
-                public ulong homeregionhandle;
-                public LLVector3 homepos;
-                public LLVector3 homelookat;
-                public bool IsGridGod=false;
-                public bool IsLocal=true;       // will be used in future for visitors from foreign grids
-                public string AssetURL;
-                public string MD5passwd;
-                public LLUUID CurrentSessionID;
-                public LLUUID CurrentSecureSessionID;
-                public LLUUID UUID;
-                public Dictionary<LLUUID, uint> Circuits = new Dictionary<LLUUID, uint>();      // tracks circuit codes
-                
-                public InventoryFolder InventoryRoot;
-                public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
-                public Dictionary<LLUUID, InventoryItem> InventoryItems;
-        
-                public UserProfile() {
-                        Circuits = new Dictionary<LLUUID, uint>();
-                        InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();
-                        InventoryItems = new Dictionary<LLUUID, InventoryItem>();
-                        InventoryRoot=new InventoryFolder();
-                        InventoryRoot.FolderID = LLUUID.Random();
-                        InventoryRoot.ParentID=new LLUUID();
-                        InventoryRoot.Version=1;
-                        InventoryRoot.DefaultType=8;
-                        InventoryRoot.FolderName="My Inventory";
-                        InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
-                        homeregionhandle=Util.UIntsToLong((997*256), (996*256));;
-                }
-        
-                public void InitSessionData() {
-                        CurrentSessionID=LLUUID.Random();
-                        CurrentSecureSessionID=LLUUID.Random();
-                }
-        
-                public void AddSimCircuit(uint circuit_code, LLUUID region_UUID) {
-                        if(this.Circuits.ContainsKey(region_UUID)== false)
-                                this.Circuits.Add(region_UUID, circuit_code);
-                }
-                public void SendDataToSim(SimProfile TheSim) {
-                        Console.WriteLine(TheSim.caps_url);
-                        Hashtable SimParams = new Hashtable();
-                        SimParams["session_id"]=this.CurrentSessionID.ToString();
-                        SimParams["secure_session_id"]=this.CurrentSecureSessionID.ToString();
-                        SimParams["firstname"]=this.firstname;
-                        SimParams["lastname"]=this.lastname;
-                        SimParams["agent_id"]=this.UUID.ToString();
-                        SimParams["circuit_code"]=(Int32)this.Circuits[TheSim.UUID];
-                        ArrayList SendParams = new ArrayList();
-                        SendParams.Add(SimParams);
-                        
-                        XmlRpcRequest GridReq = new XmlRpcRequest("expect_user",SendParams);
-                        XmlRpcResponse GridResp = GridReq.Send(TheSim.caps_url,3000);
-                }
-        }
-        public class InventoryFolder {
-                public LLUUID FolderID;
-                public LLUUID ParentID;
-                public string FolderName;
-                public ushort DefaultType;
-                public ushort Version;
-        }
-        public class InventoryItem {                    //TODO: Fixup this and add full permissions etc
-                public LLUUID FolderID;
-                public LLUUID OwnerID;
-                public LLUUID ItemID;
-                public LLUUID AssetID;
-                public LLUUID CreatorID = LLUUID.Zero;
-                public sbyte InvType;
-                public sbyte Type;
-                public string Name;
-                public string Description;
-        }
-        public class SimProfile {
-                public LLUUID UUID;
-                public ulong regionhandle;
-                public string regionname;
-                public string sim_ip;
-                public uint sim_port;
-                public string caps_url;
-                public uint RegionLocX;
-                public uint RegionLocY;
-                public string sendkey;
-                public string recvkey;
-                public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) {
-                        try {
-                        Hashtable GridReqParams = new Hashtable();
-                        GridReqParams["region_handle"]=region_handle.ToString();
-                        GridReqParams["caller"]="userserver";
-                        GridReqParams["authkey"]=SendKey;
-                        ArrayList SendParams = new ArrayList();
-                        SendParams.Add(GridReqParams);
-                        XmlRpcRequest GridReq = new XmlRpcRequest("get_sim_info",SendParams);
-        
-                        XmlRpcResponse GridResp = GridReq.Send(GridURL,3000);
-                
-                        Hashtable RespData=(Hashtable)GridResp.Value;
-                        this.UUID = new LLUUID((string)RespData["UUID"]);
-                        this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]);
-                        this.regionname=(string)RespData["regionname"];
-                        this.sim_ip=(string)RespData["sim_ip"];
-                        this.sim_port=(uint)Convert.ToUInt16(RespData["sim_port"]);
-                        this.caps_url=(string)RespData["caps_url"];
-                        this.RegionLocX=(uint)Convert.ToUInt32(RespData["RegionLocX"]);
-                        this.RegionLocY=(uint)Convert.ToUInt32(RespData["RegionLocY"]);
-                        this.sendkey=(string)RespData["sendkey"];
-                        this.recvkey=(string)RespData["recvkey"];
-                        } catch(Exception e) {
-                                Console.WriteLine(e.ToString());
-                        }
-                        return this;
-                }
- 
-                public SimProfile() {
-                }
-        }
-}
diff --git a/ogs/userserver/src/Util.cs b/ogs/userserver/src/Util.cs
deleted file mode 100644
index 1efa471..0000000
--- a/ogs/userserver/src/Util.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) OpenSim project, http://osgrid.org/
-* Copyright (c) <year>, <copyright holder>
-* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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.Collections.Generic;
-using System.Threading;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenGridServices
-{
-        /// <summary>
-        /// </summary>
-        /// 
-                public class Util
-                {
-                        public static ulong UIntsToLong(uint X, uint Y)
-                        {
-                                return Helpers.UIntsToLong(X,Y);
-                        }
-                        public Util()
-                        {
-                                
-                        }
-                }
-                
-        public class QueItem {
-                public QueItem()
-                {
-                }
-                public Packet Packet;
-                public bool Incoming;
-        }
-        public class BlockingQueue< T > {
-                private Queue< T > _queue = new Queue< T >();
-                private object _queueSync = new object();
-                public void Enqueue(T value)
-                {
-                        lock(_queueSync)
-                        {
-                                _queue.Enqueue(value);
-                                Monitor.Pulse(_queueSync);
-                        }
-                }
-                public T Dequeue()
-                {
-                        lock(_queueSync)
-                        {
-                                if( _queue.Count < 1)
-                                        Monitor.Wait(_queueSync);
-                                return _queue.Dequeue();
-                        }
-                }
-        }
-}