aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-25 14:13:51 -0500
committerTeravus Ovares (Dan Olivares)2009-11-25 14:13:51 -0500
commitdac9c6fb2360fd46603e08877d57a704eb02e183 (patch)
tree614ef8a4851d69a3fb3a76c7839ef576c234b6e7 /OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
parentPatch: Fix a bug in LAND animation when the TickCount wraps into negative num... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.zip
opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz
opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2
opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs')
-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;