From e631aafb6316d5f0d2d8874d1013713dc32d37d9 Mon Sep 17 00:00:00 2001 From: gareth Date: Wed, 14 Mar 2007 02:03:14 +0000 Subject: [PATCH] Attempted to get logout working --- opensim/src/Config/SimConfig/AssemblyInfo.cs | 2 +- opensim/src/GridInterfaces/AssemblyInfo.cs | 2 +- opensim/src/LocalServers/LocalGridServers/AssemblyInfo.cs | 2 +- opensim/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs | 2 +- opensim/src/OpenSimConsole.cs | 2 +- .../src/RemoteServers/RemoteGridServers/AssemblyInfo.cs | 2 +- opensim/src/RemoteServers/RemoteGridServers/RemoteGrid.cs | 7 ++----- opensim/src/ServerConsole/ServerConsole/AssemblyInfo.cs | 2 +- opensim/src/VersionInfo.cs | 2 +- opensim/src/physics/AssemblyInfo.cs | 2 +- opensim/src/physics/plugins/AssemblyInfo.cs | 2 +- 11 files changed, 12 insertions(+), 15 deletions(-) diff --git a/opensim/src/Config/SimConfig/AssemblyInfo.cs b/opensim/src/Config/SimConfig/AssemblyInfo.cs index dc001d338d..9a94cd2604 100644 --- a/opensim/src/Config/SimConfig/AssemblyInfo.cs +++ b/opensim/src/Config/SimConfig/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-simconfig")] [assembly: AssemblyDescriptionAttribute("The default configuration handler")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/GridInterfaces/AssemblyInfo.cs b/opensim/src/GridInterfaces/AssemblyInfo.cs index 0519dcaf36..e5b1a607d1 100644 --- a/opensim/src/GridInterfaces/AssemblyInfo.cs +++ b/opensim/src/GridInterfaces/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] [assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/opensim/src/LocalServers/LocalGridServers/AssemblyInfo.cs index ec7f899a7d..9ac1d958af 100644 --- a/opensim/src/LocalServers/LocalGridServers/AssemblyInfo.cs +++ b/opensim/src/LocalServers/LocalGridServers/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-localservers")] [assembly: AssemblyDescriptionAttribute("local grid servers")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/opensim/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs index b9910c1f73..ab2ecfa500 100644 --- a/opensim/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs +++ b/opensim/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-localstorage")] [assembly: AssemblyDescriptionAttribute("The local storage handler")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/OpenSimConsole.cs b/opensim/src/OpenSimConsole.cs index 00a4ceed7c..cf8b648330 100644 --- a/opensim/src/OpenSimConsole.cs +++ b/opensim/src/OpenSimConsole.cs @@ -175,7 +175,7 @@ namespace OpenSim break; case "users": OpenSim.world.Avatar TempAv; - this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP")); + this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP")); foreach (libsecondlife.LLUUID UUID in OpenSim_Main.local_world.Entities.Keys) { if(OpenSim_Main.local_world.Entities[UUID].ToString()== "OpenSim.world.Avatar") { diff --git a/opensim/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/opensim/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs index 867a9c9cec..b0fab6ae52 100644 --- a/opensim/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs +++ b/opensim/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-remoteservers")] [assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/opensim/src/RemoteServers/RemoteGridServers/RemoteGrid.cs index 4340e49e0d..21e3830475 100644 --- a/opensim/src/RemoteServers/RemoteGridServers/RemoteGrid.cs +++ b/opensim/src/RemoteServers/RemoteGridServers/RemoteGrid.cs @@ -112,13 +112,10 @@ namespace RemoteGridServers public bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) { - WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + GridSendKey + "/" + agentID.ToString() + "/" + circuitCode.ToString() + "/delete"); + WebRequest DeleteSession = WebRequest.Create(RemoteUrl + "/usersessions/" + sessionID.ToString()); + DeleteSession.Method="DELETE"; WebResponse GridResponse = DeleteSession.GetResponse(); - StreamReader sr = new StreamReader(GridResponse.GetResponseStream()); - String grTest = sr.ReadLine(); - sr.Close(); GridResponse.Close(); - ServerConsole.MainConsole.Instance.WriteLine("DEBUG: " + grTest); return(true); } diff --git a/opensim/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/opensim/src/ServerConsole/ServerConsole/AssemblyInfo.cs index cd538dd413..4cd5e18337 100644 --- a/opensim/src/ServerConsole/ServerConsole/AssemblyInfo.cs +++ b/opensim/src/ServerConsole/ServerConsole/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-serverconsole")] [assembly: AssemblyDescriptionAttribute("The default server console")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/VersionInfo.cs b/opensim/src/VersionInfo.cs index dfe24361d5..3f7632f3e0 100644 --- a/opensim/src/VersionInfo.cs +++ b/opensim/src/VersionInfo.cs @@ -32,6 +32,6 @@ namespace OpenSim /// public class VersionInfo { - public static string Version = "0.1, Build 1173826017, Revision 199M"; + public static string Version = "0.1, Build 1173837399, Revision 202M"; } } diff --git a/opensim/src/physics/AssemblyInfo.cs b/opensim/src/physics/AssemblyInfo.cs index 785805c167..685a223847 100644 --- a/opensim/src/physics/AssemblyInfo.cs +++ b/opensim/src/physics/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-physicsmanager")] [assembly: AssemblyDescriptionAttribute("Handles physics plugins")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] diff --git a/opensim/src/physics/plugins/AssemblyInfo.cs b/opensim/src/physics/plugins/AssemblyInfo.cs index db85ee87b7..bd33ddb345 100644 --- a/opensim/src/physics/plugins/AssemblyInfo.cs +++ b/opensim/src/physics/plugins/AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Runtime.InteropServices; [assembly: ComVisibleAttribute(false)] [assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.*.199")] +[assembly: AssemblyVersionAttribute("0.1.*.202")] [assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] [assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]