diff options
| author | Melanie | 2010-06-12 00:34:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-12 00:34:26 +0100 |
| commit | 6a2e0c707cd56d75f62d665a00ae3fa8b6601940 (patch) | |
| tree | 4af8ce931c4bc346863d881c5a1abab74765b226 | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Some people don't use Simian. Make the connector respect that it's disabled (diff) | |
| download | opensim-SC-6a2e0c707cd56d75f62d665a00ae3fa8b6601940.zip opensim-SC-6a2e0c707cd56d75f62d665a00ae3fa8b6601940.tar.gz opensim-SC-6a2e0c707cd56d75f62d665a00ae3fa8b6601940.tar.bz2 opensim-SC-6a2e0c707cd56d75f62d665a00ae3fa8b6601940.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 119868b..6a61da6 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
| @@ -63,7 +63,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 63 | #region ISharedRegionModule | 63 | #region ISharedRegionModule |
| 64 | 64 | ||
| 65 | public Type ReplaceableInterface { get { return null; } } | 65 | public Type ReplaceableInterface { get { return null; } } |
| 66 | public void RegionLoaded(Scene scene) { UploadMapTile(scene); } | 66 | public void RegionLoaded(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { UploadMapTile(scene); } } |
| 67 | public void PostInitialise() { } | 67 | public void PostInitialise() { } |
| 68 | public void Close() { } | 68 | public void Close() { } |
| 69 | 69 | ||