diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Grid/Manager | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Grid/Manager')
3 files changed, 16 insertions, 16 deletions
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 | |||
43 | { | 43 | { |
44 | case Gtk.ResponseType.Ok: | 44 | case Gtk.ResponseType.Ok: |
45 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); | 45 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); |
46 | break; | 46 | break; |
47 | 47 | ||
48 | case Gtk.ResponseType.Cancel: | 48 | case Gtk.ResponseType.Cancel: |
49 | break; | 49 | break; |
50 | } | 50 | } |
51 | this.Hide(); | 51 | this.Hide(); |
52 | } | 52 | } |
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 | |||
41 | private string ServerURL; | 41 | private string ServerURL; |
42 | public LLUUID SessionID; | 42 | public LLUUID SessionID; |
43 | public bool connected=false; | 43 | public bool connected=false; |
44 | 44 | ||
45 | public RegionBlock[][] WorldMap; | 45 | public RegionBlock[][] WorldMap; |
46 | 46 | ||
47 | public bool Connect(string GridServerURL, string username, string password) | 47 | public bool Connect(string GridServerURL, string username, string password) |
48 | { | 48 | { |
49 | try | 49 | try |
@@ -76,14 +76,14 @@ namespace OpenGridServices.Manager | |||
76 | return false; | 76 | return false; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | public void DownloadMap() | 80 | public void DownloadMap() |
81 | { | 81 | { |
82 | System.Net.WebClient mapdownloader = new WebClient(); | 82 | System.Net.WebClient mapdownloader = new WebClient(); |
83 | Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist"); | 83 | Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist"); |
84 | 84 | ||
85 | RegionBlock TempRegionData; | 85 | RegionBlock TempRegionData; |
86 | 86 | ||
87 | XmlDocument doc = new XmlDocument(); | 87 | XmlDocument doc = new XmlDocument(); |
88 | doc.Load(regionliststream); | 88 | doc.Load(regionliststream); |
89 | regionliststream.Close(); | 89 | regionliststream.Close(); |
@@ -105,12 +105,12 @@ namespace OpenGridServices.Manager | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | public bool RestartServer() | 109 | public bool RestartServer() |
110 | { | 110 | { |
111 | return true; | 111 | return true; |
112 | } | 112 | } |
113 | 113 | ||
114 | public bool ShutdownServer() | 114 | public bool ShutdownServer() |
115 | { | 115 | { |
116 | try | 116 | try |
@@ -137,7 +137,7 @@ namespace OpenGridServices.Manager | |||
137 | return false; | 137 | return false; |
138 | } | 138 | } |
139 | } | 139 | } |
140 | 140 | ||
141 | public void DisconnectServer() | 141 | public void DisconnectServer() |
142 | { | 142 | { |
143 | this.connected=false; | 143 | 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 | |||
38 | public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>(); | 38 | public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>(); |
39 | 39 | ||
40 | private static Thread OperationsRunner; | 40 | private static Thread OperationsRunner; |
41 | 41 | ||
42 | private static GridServerConnectionManager gridserverConn; | 42 | private static GridServerConnectionManager gridserverConn; |
43 | 43 | ||
44 | private static MainWindow win; | 44 | private static MainWindow win; |
45 | 45 | ||
46 | public static void DoMainLoop() | 46 | public static void DoMainLoop() |
@@ -79,7 +79,7 @@ namespace OpenGridServices.Manager | |||
79 | win.SetStatus("Could not connect"); | 79 | win.SetStatus("Could not connect"); |
80 | } | 80 | } |
81 | break; | 81 | break; |
82 | 82 | ||
83 | case "restart_gridserver": | 83 | case "restart_gridserver": |
84 | win.SetStatus("Restarting grid server..."); | 84 | win.SetStatus("Restarting grid server..."); |
85 | if (gridserverConn.RestartServer()) | 85 | if (gridserverConn.RestartServer()) |
@@ -93,7 +93,7 @@ namespace OpenGridServices.Manager | |||
93 | win.SetStatus("Error restarting grid server!!!"); | 93 | win.SetStatus("Error restarting grid server!!!"); |
94 | } | 94 | } |
95 | break; | 95 | break; |
96 | 96 | ||
97 | case "shutdown_gridserver": | 97 | case "shutdown_gridserver": |
98 | win.SetStatus("Shutting down grid server..."); | 98 | win.SetStatus("Shutting down grid server..."); |
99 | if (gridserverConn.ShutdownServer()) | 99 | if (gridserverConn.ShutdownServer()) |
@@ -108,7 +108,7 @@ namespace OpenGridServices.Manager | |||
108 | win.SetStatus("Could not shutdown grid server!!!"); | 108 | win.SetStatus("Could not shutdown grid server!!!"); |
109 | } | 109 | } |
110 | break; | 110 | break; |
111 | 111 | ||
112 | case "disconnect_gridserver": | 112 | case "disconnect_gridserver": |
113 | gridserverConn.DisconnectServer(); | 113 | gridserverConn.DisconnectServer(); |
114 | win.SetGridServerConnected(false); | 114 | win.SetGridServerConnected(false); |