From 6ec680918bc6876f1c1382fb534b653fc34da052 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Sun, 18 May 2008 23:06:50 +0000
Subject: Formatting cleanup, minor refactoring.  Fixed some comparisons of
 value types and null.

---
 OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 2 +-
 OpenSim/Region/DataSnapshot/LLSDDiscovery.cs  | 1 -
 OpenSim/Region/DataSnapshot/LandSnapshot.cs   | 7 +++----
 OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 6 +++---
 OpenSim/Region/DataSnapshot/SnapshotStore.cs  | 1 -
 5 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/DataSnapshot')

diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 40b96d5..9a25c1d 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
         /* This module doesn't check for changes, since it's *assumed* there are none.
          * Nevertheless, it's possible to have changes, since all the fields are public.
          * There's no event to subscribe to. :/
-         * 
+         *
          * I don't think anything changes the fields beyond RegionModule PostInit, however.
          */
         private Scene m_scene = null;
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index 209f804..e1d7ac3 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -23,7 +23,6 @@
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
 */
 
 using System;
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 4bfa87a..02e80ba 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -23,7 +23,6 @@
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
 */
 
 using System;
@@ -53,9 +52,9 @@ namespace OpenSim.Region.DataSnapshot.Providers
 
         /*
          * David, I don't think we need this at all. When we do the snapshot, we can
-         * simply look into the parcels that are marked for ShowDirectory -- see 
+         * simply look into the parcels that are marked for ShowDirectory -- see
          * conditional in RequestSnapshotData
-         * 
+         *
         //Revise this, look for more direct way of checking for change in land
         #region Client hooks
 
@@ -119,7 +118,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
         }
 
         public XmlNode RequestSnapshotData(XmlDocument nodeFactory)
-        {   
+        {
             ILandChannel landChannel = (LandChannel)m_scene.LandChannel;
             Dictionary<int, ILandObject> landList = null;
             try
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index af73ba0..e5b2ad4 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
             client.OnObjectPermissions += delegate(IClientAPI controller, LLUUID agentID, LLUUID sessionID,
                 byte field, uint localId, uint mask, byte set) { this.Stale = true; };
             client.OnRezObject += delegate(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd,
-                LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 
+                LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected,
                 bool RemoveItem, LLUUID fromTaskID) { this.Stale = true; };
         }
@@ -99,7 +99,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
             foreach (EntityBase entity in m_scene.Entities.Values)
             {
                 // only objects, not avatars
-                if (entity is SceneObjectGroup) 
+                if (entity is SceneObjectGroup)
                 {
                     SceneObjectGroup obj = (SceneObjectGroup)entity;
 
@@ -135,7 +135,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
                             node = nodeFactory.CreateNode(XmlNodeType.Element, "description", "");
                             node.InnerText = m_rootPart.Description;
                             xmlobject.AppendChild(node);
-                            
+
                             node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", "");
                             node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags);
                             xmlobject.AppendChild(node);
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 7e2c060..4f4beea 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -23,7 +23,6 @@
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
 */
 
 using System;
-- 
cgit v1.1