aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs12
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs8
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs2
5 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 2b18871..e08934b 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -23,7 +23,7 @@
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System.Collections; 29using System.Collections;
@@ -65,7 +65,7 @@ namespace OpenSim.Region.DataSnapshot
65 reply["str_response_string"] = response.OuterXml; 65 reply["str_response_string"] = response.OuterXml;
66 reply["int_response_code"] = statuscode; 66 reply["int_response_code"] = statuscode;
67 reply["content_type"] = "text/xml"; 67 reply["content_type"] = "text/xml";
68 68
69 return reply; 69 return reply;
70 } 70 }
71 } 71 }
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 5831ddc..af3e547 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -23,7 +23,7 @@
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System; 29using System;
@@ -70,14 +70,14 @@ namespace OpenSim.Region.DataSnapshot
70 #region IRegionModule 70 #region IRegionModule
71 public void Close() 71 public void Close()
72 { 72 {
73 73
74 } 74 }
75 75
76 public void Initialise(Scene scene, IConfigSource config) 76 public void Initialise(Scene scene, IConfigSource config)
77 { 77 {
78 if (!m_scenes.Contains(scene)) 78 if (!m_scenes.Contains(scene))
79 m_scenes.Add(scene); 79 m_scenes.Add(scene);
80 80
81 if (!m_configLoaded) 81 if (!m_configLoaded)
82 { 82 {
83 m_configLoaded = true; 83 m_configLoaded = true;
@@ -317,7 +317,7 @@ namespace OpenSim.Region.DataSnapshot
317 317
318 private String GetRegionCategory(Scene scene) 318 private String GetRegionCategory(Scene scene)
319 { 319 {
320 320
321 //Boolean choice between: 321 //Boolean choice between:
322 // "PG" - Mormontown 322 // "PG" - Mormontown
323 // "Mature" - Sodom and Gomorrah 323 // "Mature" - Sodom and Gomorrah
@@ -396,7 +396,7 @@ namespace OpenSim.Region.DataSnapshot
396 } 396 }
397 397
398 /** 398 /**
399 * Reply to the http request 399 * Reply to the http request
400 */ 400 */
401 public XmlDocument GetSnapshot(string regionName) 401 public XmlDocument GetSnapshot(string regionName)
402 { 402 {
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
index 9f19b43..fb9c51a 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
@@ -23,7 +23,7 @@
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System.Xml; 29using System.Xml;
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index b60232b..183c2a3 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -23,7 +23,7 @@
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System; 29using System;
@@ -51,9 +51,9 @@ namespace OpenSim.Region.DataSnapshot
51 51
52 /* 52 /*
53 * David, I don't think we need this at all. When we do the snapshot, we can 53 * David, I don't think we need this at all. When we do the snapshot, we can
54 * simply look into the parcels that are marked for ShowDirectory -- see 54 * simply look into the parcels that are marked for ShowDirectory -- see
55 * conditional in RequestSnapshotData 55 * conditional in RequestSnapshotData
56 * 56 *
57 //Revise this, look for more direct way of checking for change in land 57 //Revise this, look for more direct way of checking for change in land
58 #region Client hooks 58 #region Client hooks
59 59
@@ -115,7 +115,7 @@ namespace OpenSim.Region.DataSnapshot
115 } 115 }
116 116
117 public XmlNode RequestSnapshotData(XmlDocument nodeFactory) 117 public XmlNode RequestSnapshotData(XmlDocument nodeFactory)
118 { 118 {
119 ILandChannel landChannel = (LandChannel)m_scene.LandChannel; 119 ILandChannel landChannel = (LandChannel)m_scene.LandChannel;
120 Dictionary<int, ILandObject> landList = null; 120 Dictionary<int, ILandObject> landList = null;
121 try 121 try
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index b2ef6d3..3270c3a 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.DataSnapshot
58 foreach (EntityBase entity in m_scene.Entities.Values) 58 foreach (EntityBase entity in m_scene.Entities.Values)
59 { 59 {
60 // only objects, not avatars 60 // only objects, not avatars
61 if (entity is SceneObjectGroup) 61 if (entity is SceneObjectGroup)
62 { 62 {
63 SceneObjectGroup obj = (SceneObjectGroup)entity; 63 SceneObjectGroup obj = (SceneObjectGroup)entity;
64 64