16 files changed, 25 insertions, 1892 deletions
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index 2e39cd0..df29ecd 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -26,35 +26,39 @@
 */
 using System;
-using System.Threading;
 using System.Collections.Generic;
-using System.Text;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
-namespace OpenGridServices.Manager
+namespace OpenSim.Data.MySQL
 {
-    public class BlockingQueue<T>
+    /// <summary>
+    /// A MySQL Interface for user grid data
+    /// </summary>
+    public class MySQLGridUserData : MySQLGenericTableHandler<GridUserData>, IGridUserData
    {
-        private Queue<T> _queue = new Queue<T>();
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private object _queueSync = new object();
+        public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "UserGrid") {}
-        public void Enqueue(T value)
+        public GridUserData GetGridUserData(string userID)
        {
-            lock (_queueSync)
+            GridUserData[] ret = Get("UserID", userID);
-            {
-                _queue.Enqueue(value);
+            if (ret.Length == 0)
-                Monitor.Pulse(_queueSync);
+                return null;
-            }
+            return ret[0];
        }
-        public T Dequeue()
+        public bool StoreGridUserData(GridUserData data)
        {
-            lock (_queueSync)
+            return Store(data);
-            {
-                if (_queue.Count < 1)
-                    Monitor.Wait(_queueSync);
-                return _queue.Dequeue();
-            }
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.mds b/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
deleted file mode 100644
index ed7bc24..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager.mds
+++ /dev/null
@@ -1,16 +0,0 @@
-<Combine name="OpenGridServices.Manager" fileversion="2.0" outputpath="../../mono-1.2.3.1/lib/monodevelop/bin" MakePkgConfig="False" MakeLibPC="True">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="CombineConfiguration">
-      <Entry build="True" name="OpenGridServices.Manager" configuration="Debug" />
-    </Configuration>
-    <Configuration name="Release" ctype="CombineConfiguration">
-      <Entry build="True" name="OpenGridServices.Manager" configuration="Release" />
-    </Configuration>
-  </Configurations>
-  <StartMode startupentry="OpenGridServices.Manager" single="True">
-    <Execute type="None" entry="OpenGridServices.Manager" />
-  </StartMode>
-  <Entries>
-    <Entry filename="./OpenGridServices.Manager/OpenGridServices.Manager.mdp" />
-  </Entries>
-</Combine>
-\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs b/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
deleted file mode 100644
index f221509..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager.userprefs
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<UserCombinePreferences filename="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager.mds">
-  <Files>
-    <File filename="Welcome" />
-    <File filename="./OpenGridServices.Manager/MainWindow.cs" />
-    <File filename="./OpenGridServices.Manager/ConnectToGridServerDialog.cs" />
-    <File filename="./OpenGridServices.Manager/Main.cs" />
-  </Files>
-  <Views>
-    <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ProjectPad">
-      <TreeView>
-        <Node expanded="True">
-          <Node name="OpenGridServices.Manager" expanded="True">
-            <Node name="References" expanded="True" />
-            <Node name="Resources" expanded="True" />
-            <Node name="UserInterface" expanded="True" />
-            <Node name="ConnectToGridServerDialog.cs" expanded="False" selected="True" />
-          </Node>
-        </Node>
-      </TreeView>
-    </ViewMemento>
-    <ViewMemento Id="MonoDevelop.Ide.Gui.Pads.ClassPad">
-      <TreeView>
-        <Node expanded="True" />
-      </TreeView>
-    </ViewMemento>
-    <ViewMemento Id="MonoDevelop.NUnit.TestPad">
-      <TreeView>
-        <Node expanded="False" />
-      </TreeView>
-    </ViewMemento>
-  </Views>
-  <Properties>
-    <Properties>
-      <Property key="ActiveConfiguration" value="Debug" />
-      <Property key="ActiveWindow" value="/home/gareth/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs" />
-    </Properties>
-  </Properties>
-</UserCombinePreferences>
-\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks b/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
deleted file mode 100644
index d887d0e..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager.usertasks
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ArrayOfUserTask xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
-\ No newline at end of file
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
deleted file mode 100644
index 49d1818..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Reflection;
-using System.Runtime.CompilerServices;
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-[assembly: AssemblyVersion("0.6.3.*")]
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServer.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServer.cs
deleted file mode 100644
index 25f25a7..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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;
-namespace OpenGridServices.Manager
-{
-    public partial class Connect to grid server : Gtk.Dialog
-    {
-        public Connect to grid server()
-        {
-            this.Build();
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
deleted file mode 100644
index fd4d211..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 Gtk;
-using System;
-namespace OpenGridServices.Manager
-{
-    public partial class ConnectToGridServerDialog : Gtk.Dialog
-    {
-        public ConnectToGridServerDialog()
-        {
-            this.Build();
-        }
-        protected virtual void OnResponse(object o, Gtk.ResponseArgs args)
-        {
-            switch (args.ResponseId)
-            {
-                case Gtk.ResponseType.Ok:
-                    MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text);
-                    break;
-                case Gtk.ResponseType.Cancel:
-                    break;
-            }
-            this.Hide();
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
deleted file mode 100644
index 425a20e..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 Nwc.XmlRpc;
-using System;
-using System.Net;
-using System.IO;
-using System.Xml;
-using System.Collections;
-using System.Collections.Generic;
-using libsecondlife;
-namespace OpenGridServices.Manager
-{
-    public class GridServerConnectionManager
-    {
-        private string ServerURL;
-        public LLUUID SessionID;
-        public bool connected=false;
-        public RegionBlock[][] WorldMap;
-        public bool Connect(string GridServerURL, string username, string password)
-        {
-            try
-            {
-                this.ServerURL=GridServerURL;
-                Hashtable LoginParamsHT = new Hashtable();
-                LoginParamsHT["username"]=username;
-                LoginParamsHT["password"]=password;
-                ArrayList LoginParams = new ArrayList();
-                LoginParams.Add(LoginParamsHT);
-                XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
-                XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
-                if (GridResp.IsFault)
-                {
-                    connected=false;
-                    return false;
-                }
-                else
-                {
-                    Hashtable gridrespData = (Hashtable)GridResp.Value;
-                    this.SessionID = new LLUUID((string)gridrespData["session_id"]);
-                    connected=true;
-                    return true;
-                }
-            }
-            catch(Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                connected=false;
-                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();
-            XmlNode rootnode = doc.FirstChild;
-            if (rootnode.Name != "regions")
-            {
-                // TODO - ERROR!
-            }
-            for (int i = 0; i <= rootnode.ChildNodes.Count; i++)
-            {
-                if (rootnode.ChildNodes.Item(i).Name != "region")
-                {
-                    // TODO - ERROR!
-                }
-                else
-                {
-                    TempRegionData = new RegionBlock();
-                }
-            }
-        }
-        public bool RestartServer()
-        {
-            return true;
-        }
-        public bool ShutdownServer()
-        {
-            try
-            {
-                Hashtable ShutdownParamsHT = new Hashtable();
-                ArrayList ShutdownParams = new ArrayList();
-                ShutdownParamsHT["session_id"]=this.SessionID.ToString();
-                ShutdownParams.Add(ShutdownParamsHT);
-                XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams);
-                XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000);
-                if (GridResp.IsFault)
-                {
-                    return false;
-                }
-                else
-                {
-                    connected=false;
-                    return true;
-                }
-            }
-            catch(Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                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
deleted file mode 100644
index 63954d5..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Threading;
-using Gtk;
-namespace OpenGridServices.Manager
-{
-    class MainClass
-    {
-        public static bool QuitReq=false;
-        public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>();
-        private static Thread OperationsRunner;
-        private static GridServerConnectionManager gridserverConn;
-        private static MainWindow win;
-        public static void DoMainLoop()
-        {
-            while (!QuitReq)
-            {
-                Application.RunIteration();
-            }
-        }
-        public static void RunOperations()
-        {
-            string operation;
-            string cmd;
-            char[] sep = new char[1];
-            sep[0]=' ';
-            while (!QuitReq)
-            {
-                operation=PendingOperations.Dequeue();
-                Console.WriteLine(operation);
-                cmd = operation.Split(sep)[0];
-                switch (cmd)
-                {
-                    case "connect_to_gridserver":
-                        win.SetStatus("Connecting to grid server...");
-                        if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3]))
-                        {
-                            win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID);
-                            win.SetGridServerConnected(true);
-                            Thread.Sleep(3000);
-                            win.SetStatus("Downloading region maps...");
-                            gridserverConn.DownloadMap();
-                        }
-                        else
-                        {
-                            win.SetStatus("Could not connect");
-                        }
-                        break;
-                    case "restart_gridserver":
-                        win.SetStatus("Restarting grid server...");
-                        if (gridserverConn.RestartServer())
-                        {
-                            win.SetStatus("Restarted server OK");
-                            Thread.Sleep(3000);
-                            win.SetStatus("");
-                        }
-                        else
-                        {
-                            win.SetStatus("Error restarting grid server!!!");
-                        }
-                        break;
-                    case "shutdown_gridserver":
-                        win.SetStatus("Shutting down grid server...");
-                        if (gridserverConn.ShutdownServer())
-                        {
-                            win.SetStatus("Grid server shutdown");
-                            win.SetGridServerConnected(false);
-                            Thread.Sleep(3000);
-                            win.SetStatus("");
-                        }
-                        else
-                        {
-                            win.SetStatus("Could not shutdown grid server!!!");
-                        }
-                        break;
-                    case "disconnect_gridserver":
-                        gridserverConn.DisconnectServer();
-                        win.SetGridServerConnected(false);
-                        break;
-                }
-            }
-        }
-        public static void Main (string[] args)
-        {
-            gridserverConn = new GridServerConnectionManager();
-            Application.Init ();
-            win = new MainWindow ();
-            win.Show ();
-            OperationsRunner = new Thread(new ThreadStart(RunOperations));
-            OperationsRunner.IsBackground=true;
-            OperationsRunner.Start();
-            DoMainLoop();
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
deleted file mode 100644
index c6fa800..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/MainWindow.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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 Gtk;
-namespace OpenGridServices.Manager
-{
-    public partial class MainWindow: Gtk.Window
-    {
-        public MainWindow() : base (Gtk.WindowType.Toplevel)
-        {
-            Build();
-        }
-        public void SetStatus(string statustext)
-        {
-            this.statusbar1.Pop(0);
-            this.statusbar1.Push(0, statustext);
-        }
-        public void DrawGrid(RegionBlock[][] regions)
-        {
-            for (int x=0; x<=regions.GetUpperBound(0); x++)
-            {
-                for (int y=0; y<=regions.GetUpperBound(1); y++)
-                {
-                    Gdk.Image themap = new Gdk.Image(Gdk.ImageType.Fastest,Gdk.Visual.System,256,256);
-                    this.drawingarea1.GdkWindow.DrawImage(new Gdk.GC(this.drawingarea1.GdkWindow),themap,0,0,x*256,y*256,256,256);
-                }
-            }
-        }
-        public void SetGridServerConnected(bool connected)
-        {
-            if (connected)
-            {
-                this.ConnectToGridserver.Visible=false;
-                this.DisconnectFromGridServer.Visible=true;
-            }
-            else
-            {
-                this.ConnectToGridserver.Visible=true;
-                this.DisconnectFromGridServer.Visible=false;
-            }
-        }
-        protected void OnDeleteEvent (object sender, DeleteEventArgs a)
-        {
-            Application.Quit ();
-            MainClass.QuitReq=true;
-            a.RetVal = true;
-        }
-        protected virtual void QuitMenu(object sender, System.EventArgs e)
-        {
-            MainClass.QuitReq=true;
-            Application.Quit();
-        }
-        protected virtual void ConnectToGridServerMenu(object sender, System.EventArgs e)
-        {
-            ConnectToGridServerDialog griddialog = new ConnectToGridServerDialog ();
-            griddialog.Show();
-        }
-        protected virtual void RestartGridserverMenu(object sender, System.EventArgs e)
-        {
-            MainClass.PendingOperations.Enqueue("restart_gridserver");
-        }
-        protected virtual void ShutdownGridserverMenu(object sender, System.EventArgs e)
-        {
-            MainClass.PendingOperations.Enqueue("shutdown_gridserver");
-        }
-        protected virtual void DisconnectGridServerMenu(object sender, System.EventArgs e)
-        {
-            MainClass.PendingOperations.Enqueue("disconnect_gridserver");
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
deleted file mode 100644
index 6c8b0bd..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/RegionBlock.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Xml;
-using libsecondlife;
-using OpenSim.Framework.Utilities;
-namespace OpenGridServices.Manager
-{
-    public class RegionBlock
-    {
-        public uint regloc_x;
-        public uint regloc_y;
-        public string httpd_url;
-        public string region_name;
-        public ulong regionhandle {
-            get { return Util.UIntsToLong(regloc_x*256,regloc_y*256); }
-        }
-        public Gdk.Pixbuf MiniMap;
-        public RegionBlock()
-        {
-        }
-        public void LoadFromXmlNode(XmlNode sourcenode)
-        {
-            this.regloc_x=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_x").Value);
-            this.regloc_y=Convert.ToUInt32(sourcenode.Attributes.GetNamedItem("loc_y").Value);
-            this.region_name=sourcenode.Attributes.GetNamedItem("region_name").Value;
-            this.httpd_url=sourcenode.Attributes.GetNamedItem("httpd_url").Value;
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
deleted file mode 100644
index f2383bc..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.Text;
-using libsecondlife;
-using libsecondlife.Packets;
-namespace OpenSim.Framework.Utilities
-{
-    public class Util
-    {
-        private static Random randomClass = new Random();
-        private static uint nextXferID = 5000;
-        private static object XferLock = new object();
-        public static ulong UIntsToLong(uint X, uint Y)
-        {
-            return Helpers.UIntsToLong(X, Y);
-        }
-        public static Random RandomClass
-        {
-            get
-            {
-                return randomClass;
-            }
-        }
-        public static uint GetNextXferID()
-        {
-            uint id = 0;
-            lock (XferLock)
-            {
-                id = nextXferID;
-                nextXferID++;
-            }
-            return id;
-        }
-        //public static int fast_distance2d(int x, int y)
-        //{
-        //    x = System.Math.Abs(x);
-        //    y = System.Math.Abs(y);
-        //    int min = System.Math.Min(x, y);
-        //    return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
-        //}
-        public static string FieldToString(byte[] bytes)
-        {
-            return FieldToString(bytes, String.Empty);
-        }
-        /// <summary>
-        /// Convert a variable length field (byte array) to a string, with a
-        /// field name prepended to each line of the output
-        /// </summary>
-        /// <remarks>If the byte array has unprintable characters in it, a
-        /// hex dump will be put in the string instead</remarks>
-        /// <param name="bytes">The byte array to convert to a string</param>
-        /// <param name="fieldName">A field name to prepend to each line of output</param>
-        /// <returns>An ASCII string or a string containing a hex dump, minus
-        /// the null terminator</returns>
-        public static string FieldToString(byte[] bytes, string fieldName)
-        {
-            // Check for a common case
-            if (bytes.Length == 0) return String.Empty;
-            StringBuilder output = new StringBuilder();
-            bool printable = true;
-            for (int i = 0; i < bytes.Length; ++i)
-            {
-                // Check if there are any unprintable characters in the array
-                if ((bytes[i] < 0x20 || bytes[i] > 0x7E) && bytes[i] != 0x09
-                    && bytes[i] != 0x0D && bytes[i] != 0x0A && bytes[i] != 0x00)
-                {
-                    printable = false;
-                    break;
-                }
-            }
-            if (printable)
-            {
-                if (fieldName.Length > 0)
-                {
-                    output.Append(fieldName);
-                    output.Append(": ");
-                }
-                if (bytes[bytes.Length - 1] == 0x00)
-                    output.Append(UTF8Encoding.UTF8.GetString(bytes, 0, bytes.Length - 1));
-                else
-                    output.Append(UTF8Encoding.UTF8.GetString(bytes));
-            }
-            else
-            {
-                for (int i = 0; i < bytes.Length; i += 16)
-                {
-                    if (i != 0)
-                        output.Append(Environment.NewLine);
-                    if (fieldName.Length > 0)
-                    {
-                        output.Append(fieldName);
-                        output.Append(": ");
-                    }
-                    for (int j = 0; j < 16; j++)
-                    {
-                        if ((i + j) < bytes.Length)
-                            output.Append(String.Format("{0:X2} ", bytes[i + j]));
-                        else
-                            output.Append("   ");
-                    }
-                    for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
-                    {
-                        if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
-                            output.Append((char)bytes[i + j]);
-                        else
-                            output.Append(".");
-                    }
-                }
-            }
-            return output.ToString();
-        }
-        public Util()
-        {
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
deleted file mode 100644
index d80499c..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.
- */
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-//
-//      Changes to this file may cause incorrect behavior and will be lost if
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-namespace OpenGridServices.Manager
-{
-    public partial class ConnectToGridServerDialog
-    {
-        private Gtk.VBox vbox2;
-        private Gtk.VBox vbox3;
-        private Gtk.HBox hbox1;
-        private Gtk.Label label1;
-        private Gtk.Entry entry1;
-        private Gtk.HBox hbox2;
-        private Gtk.Label label2;
-        private Gtk.Entry entry2;
-        private Gtk.HBox hbox3;
-        private Gtk.Label label3;
-        private Gtk.Entry entry3;
-        private Gtk.Button button2;
-        private Gtk.Button button8;
-        protected virtual void Build()
-        {
-            Stetic.Gui.Initialize();
-            // Widget OpenGridServices.Manager.ConnectToGridServerDialog
-            this.Events = ((Gdk.EventMask)(256));
-            this.Name = "OpenGridServices.Manager.ConnectToGridServerDialog";
-            this.Title = Mono.Unix.Catalog.GetString("Connect to Grid server");
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
-            this.HasSeparator = false;
-            // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.VBox
-            Gtk.VBox w1 = this.VBox;
-            w1.Events = ((Gdk.EventMask)(256));
-            w1.Name = "dialog_VBox";
-            w1.BorderWidth = ((uint)(2));
-            // Container child dialog_VBox.Gtk.Box+BoxChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.vbox3 = new Gtk.VBox();
-            this.vbox3.Name = "vbox3";
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.label1 = new Gtk.Label();
-            this.label1.Name = "label1";
-            this.label1.Xalign = 1F;
-            this.label1.LabelProp = Mono.Unix.Catalog.GetString("Grid server URL: ");
-            this.label1.Justify = ((Gtk.Justification)(1));
-            this.hbox1.Add(this.label1);
-            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1]));
-            w2.Position = 0;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.entry1 = new Gtk.Entry();
-            this.entry1.CanFocus = true;
-            this.entry1.Name = "entry1";
-            this.entry1.Text = Mono.Unix.Catalog.GetString("http://gridserver:8001");
-            this.entry1.IsEditable = true;
-            this.entry1.MaxLength = 255;
-            this.entry1.InvisibleChar = '•';
-            this.hbox1.Add(this.entry1);
-            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.entry1]));
-            w3.Position = 1;
-            this.vbox3.Add(this.hbox1);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox1]));
-            w4.Position = 0;
-            w4.Expand = false;
-            w4.Fill = false;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox2 = new Gtk.HBox();
-            this.hbox2.Name = "hbox2";
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.label2 = new Gtk.Label();
-            this.label2.Name = "label2";
-            this.label2.Xalign = 1F;
-            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Username:");
-            this.label2.Justify = ((Gtk.Justification)(1));
-            this.hbox2.Add(this.label2);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.label2]));
-            w5.Position = 0;
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.entry2 = new Gtk.Entry();
-            this.entry2.CanFocus = true;
-            this.entry2.Name = "entry2";
-            this.entry2.IsEditable = true;
-            this.entry2.InvisibleChar = '•';
-            this.hbox2.Add(this.entry2);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.entry2]));
-            w6.Position = 1;
-            this.vbox3.Add(this.hbox2);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox2]));
-            w7.Position = 1;
-            w7.Expand = false;
-            w7.Fill = false;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox3 = new Gtk.HBox();
-            this.hbox3.Name = "hbox3";
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.label3 = new Gtk.Label();
-            this.label3.Name = "label3";
-            this.label3.Xalign = 1F;
-            this.label3.LabelProp = Mono.Unix.Catalog.GetString("Password:");
-            this.label3.Justify = ((Gtk.Justification)(1));
-            this.hbox3.Add(this.label3);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox3[this.label3]));
-            w8.Position = 0;
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.entry3 = new Gtk.Entry();
-            this.entry3.CanFocus = true;
-            this.entry3.Name = "entry3";
-            this.entry3.IsEditable = true;
-            this.entry3.InvisibleChar = '•';
-            this.hbox3.Add(this.entry3);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox3[this.entry3]));
-            w9.Position = 1;
-            this.vbox3.Add(this.hbox3);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox3]));
-            w10.Position = 2;
-            w10.Expand = false;
-            w10.Fill = false;
-            this.vbox2.Add(this.vbox3);
-            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox3]));
-            w11.Position = 2;
-            w11.Expand = false;
-            w11.Fill = false;
-            w1.Add(this.vbox2);
-            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
-            w12.Position = 0;
-            // Internal child OpenGridServices.Manager.ConnectToGridServerDialog.ActionArea
-            Gtk.HButtonBox w13 = this.ActionArea;
-            w13.Events = ((Gdk.EventMask)(256));
-            w13.Name = "OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea";
-            w13.Spacing = 6;
-            w13.BorderWidth = ((uint)(5));
-            w13.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
-            // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.button2 = new Gtk.Button();
-            this.button2.CanDefault = true;
-            this.button2.CanFocus = true;
-            this.button2.Name = "button2";
-            this.button2.UseUnderline = true;
-            // Container child button2.Gtk.Container+ContainerChild
-            Gtk.Alignment w14 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            w14.Name = "GtkAlignment";
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w15 = new Gtk.HBox();
-            w15.Name = "GtkHBox";
-            w15.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w16 = new Gtk.Image();
-            w16.Name = "image1";
-            w16.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-apply", 16, 0);
-            w15.Add(w16);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w18 = new Gtk.Label();
-            w18.Name = "GtkLabel";
-            w18.LabelProp = Mono.Unix.Catalog.GetString("Connect");
-            w18.UseUnderline = true;
-            w15.Add(w18);
-            w14.Add(w15);
-            this.button2.Add(w14);
-            this.AddActionWidget(this.button2, -5);
-            Gtk.ButtonBox.ButtonBoxChild w22 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button2]));
-            w22.Expand = false;
-            w22.Fill = false;
-            // Container child OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.button8 = new Gtk.Button();
-            this.button8.CanDefault = true;
-            this.button8.CanFocus = true;
-            this.button8.Name = "button8";
-            this.button8.UseUnderline = true;
-            // Container child button8.Gtk.Container+ContainerChild
-            Gtk.Alignment w23 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            w23.Name = "GtkAlignment1";
-            // Container child GtkAlignment1.Gtk.Container+ContainerChild
-            Gtk.HBox w24 = new Gtk.HBox();
-            w24.Name = "GtkHBox1";
-            w24.Spacing = 2;
-            // Container child GtkHBox1.Gtk.Container+ContainerChild
-            Gtk.Image w25 = new Gtk.Image();
-            w25.Name = "image2";
-            w25.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-cancel", 16, 0);
-            w24.Add(w25);
-            // Container child GtkHBox1.Gtk.Container+ContainerChild
-            Gtk.Label w27 = new Gtk.Label();
-            w27.Name = "GtkLabel1";
-            w27.LabelProp = Mono.Unix.Catalog.GetString("Cancel");
-            w27.UseUnderline = true;
-            w24.Add(w27);
-            w23.Add(w24);
-            this.button8.Add(w23);
-            this.AddActionWidget(this.button8, -6);
-            Gtk.ButtonBox.ButtonBoxChild w31 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.button8]));
-            w31.Position = 1;
-            w31.Expand = false;
-            w31.Fill = false;
-            if (this.Child != null)
-            {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 476;
-            this.DefaultHeight = 137;
-            this.Show();
-            this.Response += new Gtk.ResponseHandler(this.OnResponse);
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
deleted file mode 100644
index 0476081..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.
- */
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-//
-//      Changes to this file may cause incorrect behavior and will be lost if
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-namespace OpenGridServices.Manager
-{
-    public partial class MainWindow
-    {
-        private Gtk.Action Grid;
-        private Gtk.Action User;
-        private Gtk.Action Asset;
-        private Gtk.Action Region;
-        private Gtk.Action Services;
-        private Gtk.Action ConnectToGridserver;
-        private Gtk.Action RestartWholeGrid;
-        private Gtk.Action ShutdownWholeGrid;
-        private Gtk.Action ExitGridManager;
-        private Gtk.Action ConnectToUserserver;
-        private Gtk.Action AccountManagment;
-        private Gtk.Action GlobalNotice;
-        private Gtk.Action DisableAllLogins;
-        private Gtk.Action DisableNonGodUsersOnly;
-        private Gtk.Action ShutdownUserServer;
-        private Gtk.Action ShutdownGridserverOnly;
-        private Gtk.Action RestartGridserverOnly;
-        private Gtk.Action DefaultLocalGridUserserver;
-        private Gtk.Action CustomUserserver;
-        private Gtk.Action RemoteGridDefaultUserserver;
-        private Gtk.Action DisconnectFromGridServer;
-        private Gtk.Action UploadAsset;
-        private Gtk.Action AssetManagement;
-        private Gtk.Action ConnectToAssetServer;
-        private Gtk.Action ConnectToDefaultAssetServerForGrid;
-        private Gtk.Action DefaultForLocalGrid;
-        private Gtk.Action DefaultForRemoteGrid;
-        private Gtk.Action CustomAssetServer;
-        private Gtk.VBox vbox1;
-        private Gtk.MenuBar menubar2;
-        private Gtk.HBox hbox1;
-        private Gtk.ScrolledWindow scrolledwindow1;
-        private Gtk.DrawingArea drawingarea1;
-        private Gtk.TreeView treeview1;
-        private Gtk.Statusbar statusbar1;
-        protected virtual void Build()
-        {
-            Stetic.Gui.Initialize();
-            // Widget OpenGridServices.Manager.MainWindow
-            Gtk.UIManager w1 = new Gtk.UIManager();
-            Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default");
-            this.Grid = new Gtk.Action("Grid", Mono.Unix.Catalog.GetString("Grid"), null, null);
-            this.Grid.HideIfEmpty = false;
-            this.Grid.ShortLabel = Mono.Unix.Catalog.GetString("Grid");
-            w2.Add(this.Grid, "<Alt><Mod2>g");
-            this.User = new Gtk.Action("User", Mono.Unix.Catalog.GetString("User"), null, null);
-            this.User.HideIfEmpty = false;
-            this.User.ShortLabel = Mono.Unix.Catalog.GetString("User");
-            w2.Add(this.User, null);
-            this.Asset = new Gtk.Action("Asset", Mono.Unix.Catalog.GetString("Asset"), null, null);
-            this.Asset.HideIfEmpty = false;
-            this.Asset.ShortLabel = Mono.Unix.Catalog.GetString("Asset");
-            w2.Add(this.Asset, null);
-            this.Region = new Gtk.Action("Region", Mono.Unix.Catalog.GetString("Region"), null, null);
-            this.Region.ShortLabel = Mono.Unix.Catalog.GetString("Region");
-            w2.Add(this.Region, null);
-            this.Services = new Gtk.Action("Services", Mono.Unix.Catalog.GetString("Services"), null, null);
-            this.Services.ShortLabel = Mono.Unix.Catalog.GetString("Services");
-            w2.Add(this.Services, null);
-            this.ConnectToGridserver = new Gtk.Action("ConnectToGridserver", Mono.Unix.Catalog.GetString("Connect to gridserver..."), null, "gtk-connect");
-            this.ConnectToGridserver.HideIfEmpty = false;
-            this.ConnectToGridserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to gridserver");
-            w2.Add(this.ConnectToGridserver, null);
-            this.RestartWholeGrid = new Gtk.Action("RestartWholeGrid", Mono.Unix.Catalog.GetString("Restart whole grid"), null, "gtk-refresh");
-            this.RestartWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Restart whole grid");
-            w2.Add(this.RestartWholeGrid, null);
-            this.ShutdownWholeGrid = new Gtk.Action("ShutdownWholeGrid", Mono.Unix.Catalog.GetString("Shutdown whole grid"), null, "gtk-stop");
-            this.ShutdownWholeGrid.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown whole grid");
-            w2.Add(this.ShutdownWholeGrid, null);
-            this.ExitGridManager = new Gtk.Action("ExitGridManager", Mono.Unix.Catalog.GetString("Exit grid manager"), null, "gtk-close");
-            this.ExitGridManager.ShortLabel = Mono.Unix.Catalog.GetString("Exit grid manager");
-            w2.Add(this.ExitGridManager, null);
-            this.ConnectToUserserver = new Gtk.Action("ConnectToUserserver", Mono.Unix.Catalog.GetString("Connect to userserver"), null, "gtk-connect");
-            this.ConnectToUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Connect to userserver");
-            w2.Add(this.ConnectToUserserver, null);
-            this.AccountManagment = new Gtk.Action("AccountManagment", Mono.Unix.Catalog.GetString("Account managment"), null, "gtk-properties");
-            this.AccountManagment.ShortLabel = Mono.Unix.Catalog.GetString("Account managment");
-            w2.Add(this.AccountManagment, null);
-            this.GlobalNotice = new Gtk.Action("GlobalNotice", Mono.Unix.Catalog.GetString("Global notice"), null, "gtk-network");
-            this.GlobalNotice.ShortLabel = Mono.Unix.Catalog.GetString("Global notice");
-            w2.Add(this.GlobalNotice, null);
-            this.DisableAllLogins = new Gtk.Action("DisableAllLogins", Mono.Unix.Catalog.GetString("Disable all logins"), null, "gtk-no");
-            this.DisableAllLogins.ShortLabel = Mono.Unix.Catalog.GetString("Disable all logins");
-            w2.Add(this.DisableAllLogins, null);
-            this.DisableNonGodUsersOnly = new Gtk.Action("DisableNonGodUsersOnly", Mono.Unix.Catalog.GetString("Disable non-god users only"), null, "gtk-no");
-            this.DisableNonGodUsersOnly.ShortLabel = Mono.Unix.Catalog.GetString("Disable non-god users only");
-            w2.Add(this.DisableNonGodUsersOnly, null);
-            this.ShutdownUserServer = new Gtk.Action("ShutdownUserServer", Mono.Unix.Catalog.GetString("Shutdown user server"), null, "gtk-stop");
-            this.ShutdownUserServer.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown user server");
-            w2.Add(this.ShutdownUserServer, null);
-            this.ShutdownGridserverOnly = new Gtk.Action("ShutdownGridserverOnly", Mono.Unix.Catalog.GetString("Shutdown gridserver only"), null, "gtk-stop");
-            this.ShutdownGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Shutdown gridserver only");
-            w2.Add(this.ShutdownGridserverOnly, null);
-            this.RestartGridserverOnly = new Gtk.Action("RestartGridserverOnly", Mono.Unix.Catalog.GetString("Restart gridserver only"), null, "gtk-refresh");
-            this.RestartGridserverOnly.ShortLabel = Mono.Unix.Catalog.GetString("Restart gridserver only");
-            w2.Add(this.RestartGridserverOnly, null);
-            this.DefaultLocalGridUserserver = new Gtk.Action("DefaultLocalGridUserserver", Mono.Unix.Catalog.GetString("Default local grid userserver"), null, null);
-            this.DefaultLocalGridUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Default local grid userserver");
-            w2.Add(this.DefaultLocalGridUserserver, null);
-            this.CustomUserserver = new Gtk.Action("CustomUserserver", Mono.Unix.Catalog.GetString("Custom userserver..."), null, null);
-            this.CustomUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Custom userserver");
-            w2.Add(this.CustomUserserver, null);
-            this.RemoteGridDefaultUserserver = new Gtk.Action("RemoteGridDefaultUserserver", Mono.Unix.Catalog.GetString("Remote grid default userserver..."), null, null);
-            this.RemoteGridDefaultUserserver.ShortLabel = Mono.Unix.Catalog.GetString("Remote grid default userserver");
-            w2.Add(this.RemoteGridDefaultUserserver, null);
-            this.DisconnectFromGridServer = new Gtk.Action("DisconnectFromGridServer", Mono.Unix.Catalog.GetString("Disconnect from grid server"), null, "gtk-disconnect");
-            this.DisconnectFromGridServer.ShortLabel = Mono.Unix.Catalog.GetString("Disconnect from grid server");
-            this.DisconnectFromGridServer.Visible = false;
-            w2.Add(this.DisconnectFromGridServer, null);
-            this.UploadAsset = new Gtk.Action("UploadAsset", Mono.Unix.Catalog.GetString("Upload asset"), null, null);
-            this.UploadAsset.ShortLabel = Mono.Unix.Catalog.GetString("Upload asset");
-            w2.Add(this.UploadAsset, null);
-            this.AssetManagement = new Gtk.Action("AssetManagement", Mono.Unix.Catalog.GetString("Asset management"), null, null);
-            this.AssetManagement.ShortLabel = Mono.Unix.Catalog.GetString("Asset management");
-            w2.Add(this.AssetManagement, null);
-            this.ConnectToAssetServer = new Gtk.Action("ConnectToAssetServer", Mono.Unix.Catalog.GetString("Connect to asset server"), null, null);
-            this.ConnectToAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Connect to asset server");
-            w2.Add(this.ConnectToAssetServer, null);
-            this.ConnectToDefaultAssetServerForGrid = new Gtk.Action("ConnectToDefaultAssetServerForGrid", Mono.Unix.Catalog.GetString("Connect to default asset server for grid"), null, null);
-            this.ConnectToDefaultAssetServerForGrid.ShortLabel = Mono.Unix.Catalog.GetString("Connect to default asset server for grid");
-            w2.Add(this.ConnectToDefaultAssetServerForGrid, null);
-            this.DefaultForLocalGrid = new Gtk.Action("DefaultForLocalGrid", Mono.Unix.Catalog.GetString("Default for local grid"), null, null);
-            this.DefaultForLocalGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for local grid");
-            w2.Add(this.DefaultForLocalGrid, null);
-            this.DefaultForRemoteGrid = new Gtk.Action("DefaultForRemoteGrid", Mono.Unix.Catalog.GetString("Default for remote grid..."), null, null);
-            this.DefaultForRemoteGrid.ShortLabel = Mono.Unix.Catalog.GetString("Default for remote grid...");
-            w2.Add(this.DefaultForRemoteGrid, null);
-            this.CustomAssetServer = new Gtk.Action("CustomAssetServer", Mono.Unix.Catalog.GetString("Custom asset server..."), null, null);
-            this.CustomAssetServer.ShortLabel = Mono.Unix.Catalog.GetString("Custom asset server...");
-            w2.Add(this.CustomAssetServer, null);
-            w1.InsertActionGroup(w2, 0);
-            this.AddAccelGroup(w1.AccelGroup);
-            this.WidthRequest = 800;
-            this.HeightRequest = 600;
-            this.Name = "OpenGridServices.Manager.MainWindow";
-            this.Title = Mono.Unix.Catalog.GetString("Open Grid Services Manager");
-            this.Icon = Gtk.IconTheme.Default.LoadIcon("gtk-network", 48, 0);
-            // Container child OpenGridServices.Manager.MainWindow.Gtk.Container+ContainerChild
-            this.vbox1 = new Gtk.VBox();
-            this.vbox1.Name = "vbox1";
-            // Container child vbox1.Gtk.Box+BoxChild
-            w1.AddUiFromString("<ui><menubar name='menubar2'><menu action='Grid'><menuitem action='ConnectToGridserver'/><menuitem action='DisconnectFromGridServer'/><separator/><menuitem action='RestartWholeGrid'/><menuitem action='RestartGridserverOnly'/><separator/><menuitem action='ShutdownWholeGrid'/><menuitem action='ShutdownGridserverOnly'/><separator/><menuitem action='ExitGridManager'/></menu><menu action='User'><menu action='ConnectToUserserver'><menuitem action='DefaultLocalGridUserserver'/><menuitem action='CustomUserserver'/><menuitem action='RemoteGridDefaultUserserver'/></menu><separator/><menuitem action='AccountManagment'/><menuitem action='GlobalNotice'/><separator/><menuitem action='DisableAllLogins'/><menuitem action='DisableNonGodUsersOnly'/><separator/><menuitem action='ShutdownUserServer'/></menu><menu action='Asset'><menuitem action='UploadAsset'/><menuitem action='AssetManagement'/><menu action='ConnectToAssetServer'><menuitem action='DefaultForLocalGrid'/><menuitem action='DefaultForRemoteGrid'/><menuitem action='CustomAssetServer'/></menu></menu><menu action='Region'/><menu action='Services'/></menubar></ui>");
-            this.menubar2 = ((Gtk.MenuBar)(w1.GetWidget("/menubar2")));
-            this.menubar2.HeightRequest = 25;
-            this.menubar2.Name = "menubar2";
-            this.vbox1.Add(this.menubar2);
-            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.menubar2]));
-            w3.Position = 0;
-            w3.Expand = false;
-            w3.Fill = false;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.scrolledwindow1 = new Gtk.ScrolledWindow();
-            this.scrolledwindow1.CanFocus = true;
-            this.scrolledwindow1.Name = "scrolledwindow1";
-            this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1));
-            this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1));
-            // Container child scrolledwindow1.Gtk.Container+ContainerChild
-            Gtk.Viewport w4 = new Gtk.Viewport();
-            w4.Name = "GtkViewport";
-            w4.ShadowType = ((Gtk.ShadowType)(0));
-            // Container child GtkViewport.Gtk.Container+ContainerChild
-            this.drawingarea1 = new Gtk.DrawingArea();
-            this.drawingarea1.Name = "drawingarea1";
-            w4.Add(this.drawingarea1);
-            this.scrolledwindow1.Add(w4);
-            this.hbox1.Add(this.scrolledwindow1);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
-            w7.Position = 1;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.treeview1 = new Gtk.TreeView();
-            this.treeview1.CanFocus = true;
-            this.treeview1.Name = "treeview1";
-            this.hbox1.Add(this.treeview1);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox1[this.treeview1]));
-            w8.Position = 2;
-            this.vbox1.Add(this.hbox1);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
-            w9.Position = 1;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.statusbar1 = new Gtk.Statusbar();
-            this.statusbar1.Name = "statusbar1";
-            this.statusbar1.Spacing = 5;
-            this.vbox1.Add(this.statusbar1);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
-            w10.PackType = ((Gtk.PackType)(1));
-            w10.Position = 2;
-            w10.Expand = false;
-            w10.Fill = false;
-            this.Add(this.vbox1);
-            if (this.Child != null)
-            {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 800;
-            this.DefaultHeight = 800;
-            this.Show();
-            this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
-            this.ConnectToGridserver.Activated += new System.EventHandler(this.ConnectToGridServerMenu);
-            this.ExitGridManager.Activated += new System.EventHandler(this.QuitMenu);
-            this.ShutdownGridserverOnly.Activated += new System.EventHandler(this.ShutdownGridserverMenu);
-            this.RestartGridserverOnly.Activated += new System.EventHandler(this.RestartGridserverMenu);
-            this.DisconnectFromGridServer.Activated += new System.EventHandler(this.DisconnectGridServerMenu);
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
deleted file mode 100644
index 9fb84d2..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * 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 OpenSimulator Project 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 THE DEVELOPERS ``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 THE CONTRIBUTORS 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.
- */
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-//
-//      Changes to this file may cause incorrect behavior and will be lost if
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Stetic
-{
-    internal class Gui
-    {
-        private static bool initialized;
-        internal static void Initialize()
-        {
-            Stetic.Gui.initialized = true;
-        }
-    }
-    internal class ActionGroups
-    {
-        public static Gtk.ActionGroup GetActionGroup(System.Type type)
-        {
-            return Stetic.ActionGroups.GetActionGroup(type.FullName);
-        }
-        public static Gtk.ActionGroup GetActionGroup(string name)
-        {
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
deleted file mode 100644
index c883f08..0000000
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
-  <widget class="Gtk.Window" id="OpenGridServices.Manager.MainWindow" design-size="800 800">
-    <action-group name="Default">
-      <action id="Grid">
-        <property name="Type">Action</property>
-        <property name="Accelerator">&lt;Alt&gt;&lt;Mod2&gt;g</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">Grid</property>
-        <property name="ShortLabel" translatable="yes">Grid</property>
-      </action>
-      <action id="User">
-        <property name="Type">Action</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">User</property>
-        <property name="ShortLabel" translatable="yes">User</property>
-      </action>
-      <action id="Asset">
-        <property name="Type">Action</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">Asset</property>
-        <property name="ShortLabel" translatable="yes">Asset</property>
-      </action>
-      <action id="Region">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Region</property>
-        <property name="ShortLabel" translatable="yes">Region</property>
-      </action>
-      <action id="Services">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Services</property>
-        <property name="ShortLabel" translatable="yes">Services</property>
-      </action>
-      <action id="ConnectToGridserver">
-        <property name="Type">Action</property>
-        <property name="HideIfEmpty">False</property>
-        <property name="Label" translatable="yes">Connect to gridserver...</property>
-        <property name="ShortLabel" translatable="yes">Connect to gridserver</property>
-        <property name="StockId">gtk-connect</property>
-        <signal name="Activated" handler="ConnectToGridServerMenu" />
-      </action>
-      <action id="RestartWholeGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Restart whole grid</property>
-        <property name="ShortLabel" translatable="yes">Restart whole grid</property>
-        <property name="StockId">gtk-refresh</property>
-      </action>
-      <action id="ShutdownWholeGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Shutdown whole grid</property>
-        <property name="ShortLabel" translatable="yes">Shutdown whole grid</property>
-        <property name="StockId">gtk-stop</property>
-      </action>
-      <action id="ExitGridManager">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Exit grid manager</property>
-        <property name="ShortLabel" translatable="yes">Exit grid manager</property>
-        <property name="StockId">gtk-close</property>
-        <signal name="Activated" handler="QuitMenu" after="yes" />
-      </action>
-      <action id="ConnectToUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Connect to userserver</property>
-        <property name="ShortLabel" translatable="yes">Connect to userserver</property>
-        <property name="StockId">gtk-connect</property>
-      </action>
-      <action id="AccountManagment">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Account managment</property>
-        <property name="ShortLabel" translatable="yes">Account managment</property>
-        <property name="StockId">gtk-properties</property>
-      </action>
-      <action id="GlobalNotice">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Global notice</property>
-        <property name="ShortLabel" translatable="yes">Global notice</property>
-        <property name="StockId">gtk-network</property>
-      </action>
-      <action id="DisableAllLogins">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Disable all logins</property>
-        <property name="ShortLabel" translatable="yes">Disable all logins</property>
-        <property name="StockId">gtk-no</property>
-      </action>
-      <action id="DisableNonGodUsersOnly">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Disable non-god users only</property>
-        <property name="ShortLabel" translatable="yes">Disable non-god users only</property>
-        <property name="StockId">gtk-no</property>
-      </action>
-      <action id="ShutdownUserServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Shutdown user server</property>
-        <property name="ShortLabel" translatable="yes">Shutdown user server</property>
-        <property name="StockId">gtk-stop</property>
-      </action>
-      <action id="ShutdownGridserverOnly">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Shutdown gridserver only</property>
-        <property name="ShortLabel" translatable="yes">Shutdown gridserver only</property>
-        <property name="StockId">gtk-stop</property>
-        <signal name="Activated" handler="ShutdownGridserverMenu" after="yes" />
-      </action>
-      <action id="RestartGridserverOnly">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Restart gridserver only</property>
-        <property name="ShortLabel" translatable="yes">Restart gridserver only</property>
-        <property name="StockId">gtk-refresh</property>
-        <signal name="Activated" handler="RestartGridserverMenu" after="yes" />
-      </action>
-      <action id="DefaultLocalGridUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Default local grid userserver</property>
-        <property name="ShortLabel" translatable="yes">Default local grid userserver</property>
-      </action>
-      <action id="CustomUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Custom userserver...</property>
-        <property name="ShortLabel" translatable="yes">Custom userserver</property>
-      </action>
-      <action id="RemoteGridDefaultUserserver">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Remote grid default userserver...</property>
-        <property name="ShortLabel" translatable="yes">Remote grid default userserver</property>
-      </action>
-      <action id="DisconnectFromGridServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Disconnect from grid server</property>
-        <property name="ShortLabel" translatable="yes">Disconnect from grid server</property>
-        <property name="StockId">gtk-disconnect</property>
-        <property name="Visible">False</property>
-        <signal name="Activated" handler="DisconnectGridServerMenu" after="yes" />
-      </action>
-      <action id="UploadAsset">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Upload asset</property>
-        <property name="ShortLabel" translatable="yes">Upload asset</property>
-      </action>
-      <action id="AssetManagement">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Asset management</property>
-        <property name="ShortLabel" translatable="yes">Asset management</property>
-      </action>
-      <action id="ConnectToAssetServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Connect to asset server</property>
-        <property name="ShortLabel" translatable="yes">Connect to asset server</property>
-      </action>
-      <action id="ConnectToDefaultAssetServerForGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Connect to default asset server for grid</property>
-        <property name="ShortLabel" translatable="yes">Connect to default asset server for grid</property>
-      </action>
-      <action id="DefaultForLocalGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Default for local grid</property>
-        <property name="ShortLabel" translatable="yes">Default for local grid</property>
-      </action>
-      <action id="DefaultForRemoteGrid">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Default for remote grid...</property>
-        <property name="ShortLabel" translatable="yes">Default for remote grid...</property>
-      </action>
-      <action id="CustomAssetServer">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Custom asset server...</property>
-        <property name="ShortLabel" translatable="yes">Custom asset server...</property>
-      </action>
-    </action-group>
-    <property name="MemberName" />
-    <property name="WidthRequest">800</property>
-    <property name="HeightRequest">600</property>
-    <property name="Title" translatable="yes">Open Grid Services Manager</property>
-    <property name="Icon">stock:gtk-network Dialog</property>
-    <signal name="DeleteEvent" handler="OnDeleteEvent" />
-    <child>
-      <widget class="Gtk.VBox" id="vbox1">
-        <property name="MemberName" />
-        <child>
-          <widget class="Gtk.MenuBar" id="menubar2">
-            <property name="MemberName" />
-            <property name="HeightRequest">25</property>
-            <node name="menubar2" type="Menubar">
-              <node type="Menu" action="Grid">
-                <node type="Menuitem" action="ConnectToGridserver" />
-                <node type="Menuitem" action="DisconnectFromGridServer" />
-                <node type="Separator" />
-                <node type="Menuitem" action="RestartWholeGrid" />
-                <node type="Menuitem" action="RestartGridserverOnly" />
-                <node type="Separator" />
-                <node type="Menuitem" action="ShutdownWholeGrid" />
-                <node type="Menuitem" action="ShutdownGridserverOnly" />
-                <node type="Separator" />
-                <node type="Menuitem" action="ExitGridManager" />
-              </node>
-              <node type="Menu" action="User">
-                <node type="Menu" action="ConnectToUserserver">
-                  <node type="Menuitem" action="DefaultLocalGridUserserver" />
-                  <node type="Menuitem" action="CustomUserserver" />
-                  <node type="Menuitem" action="RemoteGridDefaultUserserver" />
-                </node>
-                <node type="Separator" />
-                <node type="Menuitem" action="AccountManagment" />
-                <node type="Menuitem" action="GlobalNotice" />
-                <node type="Separator" />
-                <node type="Menuitem" action="DisableAllLogins" />
-                <node type="Menuitem" action="DisableNonGodUsersOnly" />
-                <node type="Separator" />
-                <node type="Menuitem" action="ShutdownUserServer" />
-              </node>
-              <node type="Menu" action="Asset">
-                <node type="Menuitem" action="UploadAsset" />
-                <node type="Menuitem" action="AssetManagement" />
-                <node type="Menu" action="ConnectToAssetServer">
-                  <node type="Menuitem" action="DefaultForLocalGrid" />
-                  <node type="Menuitem" action="DefaultForRemoteGrid" />
-                  <node type="Menuitem" action="CustomAssetServer" />
-                </node>
-              </node>
-              <node type="Menu" action="Region" />
-              <node type="Menu" action="Services" />
-            </node>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HBox" id="hbox1">
-            <property name="MemberName" />
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="VscrollbarPolicy">Automatic</property>
-                <property name="HscrollbarPolicy">Automatic</property>
-                <child>
-                  <widget class="Gtk.Viewport" id="GtkViewport">
-                    <property name="MemberName" />
-                    <property name="ShadowType">None</property>
-                    <child>
-                      <widget class="Gtk.DrawingArea" id="drawingarea1">
-                        <property name="MemberName" />
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.TreeView" id="treeview1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Statusbar" id="statusbar1">
-            <property name="MemberName">statusBar1</property>
-            <property name="Spacing">5</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="PackType">End</property>
-            <property name="Position">2</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="OpenGridServices.Manager.ConnectToGridServerDialog" design-size="476 137">
-    <property name="MemberName" />
-    <property name="Events">ButtonPressMask</property>
-    <property name="Title" translatable="yes">Connect to Grid server</property>
-    <property name="WindowPosition">CenterOnParent</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <property name="HasSeparator">False</property>
-    <signal name="Response" handler="OnResponse" />
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog_VBox">
-        <property name="MemberName" />
-        <property name="Events">ButtonPressMask</property>
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox2">
-            <property name="MemberName" />
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox3">
-                <property name="MemberName" />
-                <child>
-                  <widget class="Gtk.HBox" id="hbox1">
-                    <property name="MemberName" />
-                    <child>
-                      <widget class="Gtk.Label" id="label1">
-                        <property name="MemberName" />
-                        <property name="Xalign">1</property>
-                        <property name="LabelProp" translatable="yes">Grid server URL: </property>
-                        <property name="Justify">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="entry1">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Text" translatable="yes">http://gridserver:8001</property>
-                        <property name="IsEditable">True</property>
-                        <property name="MaxLength">255</property>
-                        <property name="InvisibleChar">•</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox2">
-                    <property name="MemberName" />
-                    <child>
-                      <widget class="Gtk.Label" id="label2">
-                        <property name="MemberName" />
-                        <property name="Xalign">1</property>
-                        <property name="LabelProp" translatable="yes">Username:</property>
-                        <property name="Justify">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="entry2">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="InvisibleChar">•</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox3">
-                    <property name="MemberName" />
-                    <child>
-                      <widget class="Gtk.Label" id="label3">
-                        <property name="MemberName" />
-                        <property name="Xalign">1</property>
-                        <property name="LabelProp" translatable="yes">Password:</property>
-                        <property name="Justify">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="entry3">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="InvisibleChar">•</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="OpenGridServices.Manager.ConnectToGridServerDialog_ActionArea">
-        <property name="MemberName" />
-        <property name="Events">ButtonPressMask</property>
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="button2">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-apply Menu</property>
-            <property name="Label" translatable="yes">Connect</property>
-            <property name="UseUnderline">True</property>
-            <property name="IsDialogButton">True</property>
-            <property name="ResponseId">-5</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="button8">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-cancel Menu</property>
-            <property name="Label" translatable="yes">Cancel</property>
-            <property name="UseUnderline">True</property>
-            <property name="IsDialogButton">True</property>
-            <property name="ResponseId">-6</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</stetic-interface>
-\ No newline at end of file