Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

2 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index bb9b623..8739ce5 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -231,6 +231,10 @@ namespace OpenSim.Client.Linden
             {
                 return scene.RegionInfo;
             }
+            else if (m_scenes.Count > 0)
+            {
+                return m_scenes[0].RegionInfo;
+            }
             return null;
         }
 
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index a6b0396..0b442cc 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -110,8 +110,11 @@ namespace OpenSim.Client.MXP
         public void Close()
         {
             m_shutdown = true;
-            lock (m_ticker)
-                m_ticker.Stop();
+            if (m_ticker != null)
+            {
+                lock (m_ticker)
+                    m_ticker.Stop();
+            }
         }
 
         public string Name