diff options
author | Melanie | 2013-06-23 01:59:57 +0100 |
---|---|---|
committer | Melanie | 2013-06-23 01:59:57 +0100 |
commit | f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch) | |
tree | ffda32c340bd7f6d69652e9d9a959c7396f42a2f /OpenSim/Region/CoreModules/World/Land | |
parent | Merge branch 'avination-current' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 31f8a3f..ce4bd0f 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) |