aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
diff options
context:
space:
mode:
authorMelanie2009-11-25 17:04:05 +0000
committerMelanie2009-11-25 17:04:05 +0000
commit79395bc7dbe5efbba604adae733c31cfbe9bf529 (patch)
treeff113c356963af91d5187d8ecc65cd3f3efc0f1a /OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
parentChange osTeleportAgent parameters from long to int. That numerical range is (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.zip
opensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.tar.gz
opensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.tar.bz2
opensim-SC_OLD-79395bc7dbe5efbba604adae733c31cfbe9bf529.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-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;