Merge branch 'master' into careminster-presence-refactor

2010-06-12 00:34:26 +01:00 · 2010-06-12 00:34:26 +01:00 · 6a2e0c707c
parent 836728e5de ed38b4a140
commit 6a2e0c707c
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@ -63,7 +63,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        #region ISharedRegionModule

        public Type ReplaceableInterface { get { return null; } }
-        public void RegionLoaded(Scene scene) { UploadMapTile(scene); }
+        public void RegionLoaded(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { UploadMapTile(scene); } }
        public void PostInitialise() { }
        public void Close() { }