Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor

2 files changed, 30 insertions, 26 deletions

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 4dee7a4..1368e46 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -82,20 +82,22 @@ namespace OpenSim.Services.GridService
             {
                 m_RootInstance = this;
 
-                MainConsole.Instance.Commands.AddCommand("grid", true,
-                        "show region",
-                        "show region <Region name>",
-                        "Show details on a region",
-                        String.Empty,
-                        HandleShowRegion);
-
-                MainConsole.Instance.Commands.AddCommand("grid", true,
-                        "set region flags",
-                        "set region flags <Region name> <flags>",
-                        "Set database flags for region",
-                        String.Empty,
-                        HandleSetFlags);
-
+                if (MainConsole.Instance != null)
+                {
+                    MainConsole.Instance.Commands.AddCommand("grid", true,
+                            "show region",
+                            "show region <Region name>",
+                            "Show details on a region",
+                            String.Empty,
+                            HandleShowRegion);
+
+                    MainConsole.Instance.Commands.AddCommand("grid", true,
+                            "set region flags",
+                            "set region flags <Region name> <flags>",
+                            "Set database flags for region",
+                            String.Empty,
+                            HandleSetFlags);
+                }
                 m_HypergridLinker = new HypergridLinker(m_config, this, m_Database);
             }
         }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 18d0586..de5df9d 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -113,18 +113,20 @@ namespace OpenSim.Services.GridService
 
                 m_log.DebugFormat("[HYPERGRID LINKER]: Loaded all services...");
             }
-            
-
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
-                "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
-                "Link a hypergrid region", RunCommand);
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region",
-                "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
-                "Unlink a hypergrid region", RunCommand);
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
-                "Set local coordinate to map HG regions to", RunCommand);
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>",
-                "List the HG regions", HandleShow);
+
+            if (MainConsole.Instance != null)
+            {
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
+                    "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
+                    "Link a hypergrid region", RunCommand);
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region",
+                    "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
+                    "Unlink a hypergrid region", RunCommand);
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
+                    "Set local coordinate to map HG regions to", RunCommand);
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>",
+                    "List the HG regions", HandleShow);
+            }
         }