aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot/LandSnapshot.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-17 23:08:46 +0000
committerMelanie Thielker2008-09-17 23:08:46 +0000
commit386c3e41f0e92737f0478cf789438e8fb3c3c1e3 (patch)
tree0c59cfa1bcd57fb2c03029bf0a549fc248a1baf6 /OpenSim/Region/DataSnapshot/LandSnapshot.cs
parentKan-Ed fix series. Fix llTakeControls to behave as documented. (diff)
downloadopensim-SC_OLD-386c3e41f0e92737f0478cf789438e8fb3c3c1e3.zip
opensim-SC_OLD-386c3e41f0e92737f0478cf789438e8fb3c3c1e3.tar.gz
opensim-SC_OLD-386c3e41f0e92737f0478cf789438e8fb3c3c1e3.tar.bz2
opensim-SC_OLD-386c3e41f0e92737f0478cf789438e8fb3c3c1e3.tar.xz
Add various XML elements to the data snapshot. Changes by Fly-Man and
myself. Fix a crash in DataSnapshot when no master avatar and no estate owner is set (e.g. "Mainland").
Diffstat (limited to 'OpenSim/Region/DataSnapshot/LandSnapshot.cs')
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs27
1 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index dc7ef8c..a06c64f 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -145,11 +145,20 @@ namespace OpenSim.Region.DataSnapshot.Providers
145 // Attributes of the parcel node 145 // Attributes of the parcel node
146 XmlAttribute scripts_attr = nodeFactory.CreateAttribute("scripts"); 146 XmlAttribute scripts_attr = nodeFactory.CreateAttribute("scripts");
147 scripts_attr.Value = GetScriptsPermissions(parcel); 147 scripts_attr.Value = GetScriptsPermissions(parcel);
148 XmlAttribute build_attr = nodeFactory.CreateAttribute("build");
149 build_attr.Value = GetBuildPermissions(parcel);
150 XmlAttribute public_attr = nodeFactory.CreateAttribute("public");
151 public_attr.Value = GetPublicPermissions(parcel);
152 // Check the category of the Parcel
148 XmlAttribute category_attr = nodeFactory.CreateAttribute("category"); 153 XmlAttribute category_attr = nodeFactory.CreateAttribute("category");
149 category_attr.Value = parcel.Category.ToString(); 154 category_attr.Value = parcel.Category.ToString();
155
156
150 //XmlAttribute entities_attr = nodeFactory.CreateAttribute("entities"); 157 //XmlAttribute entities_attr = nodeFactory.CreateAttribute("entities");
151 //entities_attr.Value = land.primsOverMe.Count.ToString(); 158 //entities_attr.Value = land.primsOverMe.Count.ToString();
152 xmlparcel.Attributes.Append(scripts_attr); 159 xmlparcel.Attributes.Append(scripts_attr);
160 xmlparcel.Attributes.Append(build_attr);
161 xmlparcel.Attributes.Append(public_attr);
153 xmlparcel.Attributes.Append(category_attr); 162 xmlparcel.Attributes.Append(category_attr);
154 //xmlparcel.Attributes.Append(entities_attr); 163 //xmlparcel.Attributes.Append(entities_attr);
155 164
@@ -279,6 +288,24 @@ namespace OpenSim.Region.DataSnapshot.Providers
279 288
280 } 289 }
281 290
291 private string GetPublicPermissions(LandData parcel)
292 {
293 if ((parcel.Flags & (uint)Parcel.ParcelFlags.UseAccessList) == (uint)Parcel.ParcelFlags.UseAccessList)
294 return "yes";
295 else
296 return "no";
297
298 }
299
300 private string GetBuildPermissions(LandData parcel)
301 {
302 if ((parcel.Flags & (uint)Parcel.ParcelFlags.CreateObjects) == (uint)Parcel.ParcelFlags.CreateObjects)
303 return "yes";
304 else
305 return "no";
306
307 }
308
282 #endregion 309 #endregion
283 310
284 #region Change detection hooks 311 #region Change detection hooks