aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-21 00:46:16 +0200
committerMelanie2010-08-21 00:29:27 +0100
commitea1df09fa4cc0c3322b147651f5d8ac3fefce55e (patch)
tree2273ee45fb2409a598b5e123f240b16d08302a4b
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-ea1df09fa4cc0c3322b147651f5d8ac3fefce55e.zip
opensim-SC_OLD-ea1df09fa4cc0c3322b147651f5d8ac3fefce55e.tar.gz
opensim-SC_OLD-ea1df09fa4cc0c3322b147651f5d8ac3fefce55e.tar.bz2
opensim-SC_OLD-ea1df09fa4cc0c3322b147651f5d8ac3fefce55e.tar.xz
Forward-port a small improvement to the land out connector
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index 2386060..252d9e7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -102,7 +102,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
102 102
103 public void RegionLoaded(Scene scene) 103 public void RegionLoaded(Scene scene)
104 { 104 {
105 m_GridService = scene.GridService; 105 if (m_Enabled)
106 m_GridService = scene.GridService;
106 } 107 }
107 108
108 109