aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-16 11:43:30 +0300
committerOren Hurvitz2014-04-20 06:23:35 +0100
commita780e01a544e13cc0326ad92ca7927b2443e5ce4 (patch)
tree55e84ea91ed7182876df10e3bfb445e3e8e59a5d /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentCatch empty url error (diff)
downloadopensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.zip
opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.tar.gz
opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.tar.bz2
opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.tar.xz
Fixed: the parcel flag "Allow Scripts from Group" should only check if the parcel has a Group set; it doesn't have to be *deeded* to the group
Also some cleanup of the use of Group ID's (with no change to functionality).
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index af19ca3..57fa4d9 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -120,6 +120,12 @@ namespace OpenSim.Region.CoreModules.World.Land
120 120
121 #region Constructors 121 #region Constructors
122 122
123 public LandObject(LandData landData, Scene scene)
124 {
125 LandData = landData.Copy();
126 m_scene = scene;
127 }
128
123 public LandObject(UUID owner_id, bool is_group_owned, Scene scene) 129 public LandObject(UUID owner_id, bool is_group_owned, Scene scene)
124 { 130 {
125 m_scene = scene; 131 m_scene = scene;
@@ -163,12 +169,8 @@ namespace OpenSim.Region.CoreModules.World.Land
163 169
164 public ILandObject Copy() 170 public ILandObject Copy()
165 { 171 {
166 ILandObject newLand = new LandObject(LandData.OwnerID, LandData.IsGroupOwned, m_scene); 172 ILandObject newLand = new LandObject(LandData, m_scene);
167
168 //Place all new variables here!
169 newLand.LandBitmap = (bool[,]) (LandBitmap.Clone()); 173 newLand.LandBitmap = (bool[,]) (LandBitmap.Clone());
170 newLand.LandData = LandData.Copy();
171
172 return newLand; 174 return newLand;
173 } 175 }
174 176