aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/DataSnapshot
diff options
context:
space:
mode:
authorUbitUmarov2016-11-05 23:56:55 +0000
committerUbitUmarov2016-11-05 23:56:55 +0000
commit6bc76860d185ba6296f268373ccfea6375fff611 (patch)
treec39a51b9cd411a198be1f93fbc96a4bab0260241 /OpenSim/Region/OptionalModules/DataSnapshot
parentsome types may already be native in MOD_Api ConvertFromLSL (diff)
downloadopensim-SC_OLD-6bc76860d185ba6296f268373ccfea6375fff611.zip
opensim-SC_OLD-6bc76860d185ba6296f268373ccfea6375fff611.tar.gz
opensim-SC_OLD-6bc76860d185ba6296f268373ccfea6375fff611.tar.bz2
opensim-SC_OLD-6bc76860d185ba6296f268373ccfea6375fff611.tar.xz
avoid a null ref, few changes to udp updates send
Diffstat (limited to 'OpenSim/Region/OptionalModules/DataSnapshot')
-rw-r--r--OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
index b8c90cd..5c791e6 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs
@@ -120,12 +120,15 @@ namespace OpenSim.Region.DataSnapshot.Providers
120 120
121 public XmlNode RequestSnapshotData(XmlDocument nodeFactory) 121 public XmlNode RequestSnapshotData(XmlDocument nodeFactory)
122 { 122 {
123 XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", "");
123 ILandChannel landChannel = m_scene.LandChannel; 124 ILandChannel landChannel = m_scene.LandChannel;
125 if(landChannel == null)
126 return parent;
127
124 List<ILandObject> parcels = landChannel.AllParcels(); 128 List<ILandObject> parcels = landChannel.AllParcels();
125 129
126 IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); 130 IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
127 131
128 XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", "");
129 if (parcels != null) 132 if (parcels != null)
130 { 133 {
131 134