brought zircon branch into trunk

8 files changed, 11 insertions, 617 deletions

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/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();

-                        }

-                }

-        }

-}