diff options
| author | root | 2009-11-26 20:41:38 +0100 |
|---|---|---|
| committer | root | 2009-11-26 20:41:38 +0100 |
| commit | 2c3f6aaa878b5458eeeab8544226ff53b7172f5a (patch) | |
| tree | 48941505962693508016fafb479c2baaf1b3568f /OpenSim/Region/RegionCombinerModule | |
| parent | First attempt at mult-sit on large single prims. (diff) | |
| parent | Remove OS version crap from about dialog (diff) | |
| download | opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.zip opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.gz opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.bz2 opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs | 1 |
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; |