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

1 files changed, 16 insertions, 14 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);
             }
         }