aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule
diff options
context:
space:
mode:
authorMelanie2009-11-25 17:03:11 +0000
committerMelanie2009-11-25 17:03:11 +0000
commitcc3617f74fd857860d4396997f2d3d6a0169db5f (patch)
treee33bb44b27ec91dd22f603a074d86cde56c12da4 /OpenSim/Region/RegionCombinerModule
parentChange osTeleportAgent parameters from long to int. That numerical range is (diff)
parentminor: add doc to a few parcel methods (diff)
downloadopensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.zip
opensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.gz
opensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.bz2
opensim-SC_OLD-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index 146ec66..9da818a 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -118,6 +118,7 @@ public class RegionCombinerLargeLandChannel : ILandChannel
118 return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY); 118 return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
119 } 119 }
120 } 120 }
121
121 ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene); 122 ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
122 obj.LandData.Name = "NO LAND"; 123 obj.LandData.Name = "NO LAND";
123 return obj; 124 return obj;