From 6ef9d4da901a346c232458317cca6268da888e2e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 18 Aug 2008 00:39:10 +0000 Subject: Formatting cleanup. --- .../ConnectToGridServerDialog.cs | 6 +++--- .../GridServerConnectionManager.cs | 16 ++++++++-------- OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenSim/Grid/Manager/OpenGridServices.Manager') diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs index 210e195..06bcee2 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs @@ -43,10 +43,10 @@ namespace OpenGridServices.Manager { case Gtk.ResponseType.Ok: MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); - break; - + break; + case Gtk.ResponseType.Cancel: - break; + break; } this.Hide(); } diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs index cf44ac2..c39e72a 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs @@ -41,9 +41,9 @@ namespace OpenGridServices.Manager private string ServerURL; public LLUUID SessionID; public bool connected=false; - + public RegionBlock[][] WorldMap; - + public bool Connect(string GridServerURL, string username, string password) { try @@ -76,14 +76,14 @@ namespace OpenGridServices.Manager return false; } } - + public void DownloadMap() { System.Net.WebClient mapdownloader = new WebClient(); Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist"); - + RegionBlock TempRegionData; - + XmlDocument doc = new XmlDocument(); doc.Load(regionliststream); regionliststream.Close(); @@ -105,12 +105,12 @@ namespace OpenGridServices.Manager } } } - + public bool RestartServer() { return true; } - + public bool ShutdownServer() { try @@ -137,7 +137,7 @@ namespace OpenGridServices.Manager return false; } } - + public void DisconnectServer() { this.connected=false; diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs index 7700229..f081665 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs @@ -38,9 +38,9 @@ namespace OpenGridServices.Manager public static BlockingQueue PendingOperations = new BlockingQueue(); private static Thread OperationsRunner; - + private static GridServerConnectionManager gridserverConn; - + private static MainWindow win; public static void DoMainLoop() @@ -79,7 +79,7 @@ namespace OpenGridServices.Manager win.SetStatus("Could not connect"); } break; - + case "restart_gridserver": win.SetStatus("Restarting grid server..."); if (gridserverConn.RestartServer()) @@ -93,7 +93,7 @@ namespace OpenGridServices.Manager win.SetStatus("Error restarting grid server!!!"); } break; - + case "shutdown_gridserver": win.SetStatus("Shutting down grid server..."); if (gridserverConn.ShutdownServer()) @@ -108,7 +108,7 @@ namespace OpenGridServices.Manager win.SetStatus("Could not shutdown grid server!!!"); } break; - + case "disconnect_gridserver": gridserverConn.DisconnectServer(); win.SetGridServerConnected(false); -- cgit v1.1