diff options
Diffstat (limited to '')
3 files changed, 20 insertions, 13 deletions
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index 0c3446d..39e731f 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Region.DataSnapshot | |||
101 | 101 | ||
102 | public void Initialise(IConfigSource config) | 102 | public void Initialise(IConfigSource config) |
103 | { | 103 | { |
104 | if (!m_configLoaded) | 104 | if (!m_configLoaded) |
105 | { | 105 | { |
106 | m_configLoaded = true; | 106 | m_configLoaded = true; |
107 | //m_log.Debug("[DATASNAPSHOT]: Loading configuration"); | 107 | //m_log.Debug("[DATASNAPSHOT]: Loading configuration"); |
@@ -114,12 +114,12 @@ namespace OpenSim.Region.DataSnapshot | |||
114 | string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 114 | string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
115 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | 115 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); |
116 | // Legacy. Remove soon! | 116 | // Legacy. Remove soon! |
117 | if (string.IsNullOrEmpty(gatekeeper)) | 117 | //// if (string.IsNullOrEmpty(gatekeeper)) |
118 | { | 118 | //// { |
119 | IConfig conf = config.Configs["GridService"]; | 119 | //// IConfig conf = config.Configs["GridService"]; |
120 | if (conf != null) | 120 | //// if (conf != null) |
121 | gatekeeper = conf.GetString("Gatekeeper", gatekeeper); | 121 | //// gatekeeper = conf.GetString("Gatekeeper", gatekeeper); |
122 | } | 122 | //// } |
123 | if (!string.IsNullOrEmpty(gatekeeper)) | 123 | if (!string.IsNullOrEmpty(gatekeeper)) |
124 | m_gridinfo.Add("gatekeeperURL", gatekeeper); | 124 | m_gridinfo.Add("gatekeeperURL", gatekeeper); |
125 | 125 | ||
@@ -248,7 +248,7 @@ namespace OpenSim.Region.DataSnapshot | |||
248 | m_snapStore.ForceSceneStale(scene); | 248 | m_snapStore.ForceSceneStale(scene); |
249 | } | 249 | } |
250 | 250 | ||
251 | public void Close() | 251 | public void Close() |
252 | { | 252 | { |
253 | if (!m_enabled) | 253 | if (!m_enabled) |
254 | return; | 254 | return; |
@@ -432,7 +432,6 @@ namespace OpenSim.Region.DataSnapshot | |||
432 | m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret); | 432 | m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret); |
433 | } | 433 | } |
434 | } | 434 | } |
435 | |||
436 | } | 435 | } |
437 | #endregion | 436 | #endregion |
438 | 437 | ||
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs index b8c90cd..8e6a30e 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 | ||
@@ -140,7 +143,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
140 | 143 | ||
141 | LandData parcel = land.LandData; | 144 | LandData parcel = land.LandData; |
142 | if (m_parent.ExposureLevel.Equals("all") || | 145 | if (m_parent.ExposureLevel.Equals("all") || |
143 | (m_parent.ExposureLevel.Equals("minimum") && | 146 | (m_parent.ExposureLevel.Equals("minimum") && |
144 | (parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)) | 147 | (parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)) |
145 | { | 148 | { |
146 | 149 | ||
@@ -265,8 +268,12 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
265 | { | 268 | { |
266 | XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", ""); | 269 | XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", ""); |
267 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, userOwnerUUID); | 270 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, userOwnerUUID); |
268 | username.InnerText = account.FirstName + " " + account.LastName; | 271 | if(account != null) |
272 | username.InnerText = account.FirstName + " " + account.LastName; | ||
273 | else | ||
274 | username.InnerText = "UnKnown"; | ||
269 | userblock.AppendChild(username); | 275 | userblock.AppendChild(username); |
276 | |||
270 | } | 277 | } |
271 | catch (Exception) | 278 | catch (Exception) |
272 | { | 279 | { |
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/ObjectSnapshot.cs index 0bb4044..caca303 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/ObjectSnapshot.cs | |||
@@ -83,7 +83,8 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
83 | { this.Stale = true; }; | 83 | { this.Stale = true; }; |
84 | client.OnObjectPermissions += delegate(IClientAPI controller, UUID agentID, UUID sessionID, | 84 | client.OnObjectPermissions += delegate(IClientAPI controller, UUID agentID, UUID sessionID, |
85 | byte field, uint localId, uint mask, byte set) { this.Stale = true; }; | 85 | byte field, uint localId, uint mask, byte set) { this.Stale = true; }; |
86 | client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, | 86 | client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, UUID groupID, |
87 | Vector3 RayEnd, | ||
87 | Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 88 | Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
88 | bool RezSelected, | 89 | bool RezSelected, |
89 | bool RemoveItem, UUID fromTaskID) { this.Stale = true; }; | 90 | bool RemoveItem, UUID fromTaskID) { this.Stale = true; }; |