diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 2eafd44..74c2144 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -82,14 +82,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
82 | 82 | ||
83 | set { m_landData = value; } | 83 | set { m_landData = value; } |
84 | } | 84 | } |
85 | 85 | ||
86 | public IPrimCounts PrimCounts { get; set; } | 86 | public IPrimCounts PrimCounts { get; set; } |
87 | 87 | ||
88 | public UUID RegionUUID | 88 | public UUID RegionUUID |
89 | { | 89 | { |
90 | get { return m_scene.RegionInfo.RegionID; } | 90 | get { return m_scene.RegionInfo.RegionID; } |
91 | } | 91 | } |
92 | 92 | ||
93 | public Vector3 StartPoint | 93 | public Vector3 StartPoint |
94 | { | 94 | { |
95 | get | 95 | get |
@@ -102,11 +102,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
102 | return new Vector3(x * 4, y * 4, 0); | 102 | return new Vector3(x * 4, y * 4, 0); |
103 | } | 103 | } |
104 | } | 104 | } |
105 | 105 | ||
106 | return new Vector3(-1, -1, -1); | 106 | return new Vector3(-1, -1, -1); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | public Vector3 EndPoint | 110 | public Vector3 EndPoint |
111 | { | 111 | { |
112 | get | 112 | get |
@@ -117,15 +117,15 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
117 | { | 117 | { |
118 | if (LandBitmap[x, y]) | 118 | if (LandBitmap[x, y]) |
119 | { | 119 | { |
120 | return new Vector3(x * 4, y * 4, 0); | 120 | return new Vector3(x * 4 + 4, y * 4 + 4, 0); |
121 | } | 121 | } |
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | return new Vector3(-1, -1, -1); | 125 | return new Vector3(-1, -1, -1); |
126 | } | 126 | } |
127 | } | 127 | } |
128 | 128 | ||
129 | #region Constructors | 129 | #region Constructors |
130 | 130 | ||
131 | public LandObject(UUID owner_id, bool is_group_owned, Scene scene) | 131 | public LandObject(UUID owner_id, bool is_group_owned, Scene scene) |
@@ -249,13 +249,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
249 | if (estateModule != null) | 249 | if (estateModule != null) |
250 | regionFlags = estateModule.GetRegionFlags(); | 250 | regionFlags = estateModule.GetRegionFlags(); |
251 | 251 | ||
252 | // In a perfect world, this would have worked. | ||
253 | // | ||
254 | // if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0) | ||
255 | // regionFlags |= (uint)RegionFlags.AllowLandmark; | ||
256 | // if (landData.OwnerID == remote_client.AgentId) | ||
257 | // regionFlags |= (uint)RegionFlags.AllowSetHome; | ||
258 | |||
259 | int seq_id; | 252 | int seq_id; |
260 | if (snap_selection && (sequence_id == 0)) | 253 | if (snap_selection && (sequence_id == 0)) |
261 | { | 254 | { |