From 5c360e7374d6d3529f7578195a86a13e3858389f Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 19 Aug 2008 13:07:24 +0000
Subject: Update svn properties, minor formatting cleanup. Remove old comment
 in SnapshotStore pointed out by ChrisDown (bug #2000)

---
 OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 4 ++--
 OpenSim/Region/DataSnapshot/SnapshotStore.cs                | 1 -
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs        | 8 ++++----
 OpenSim/Region/Environment/Scenes/ScenePresence.cs          | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index c0e6722..a2e1e0c 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -102,9 +102,9 @@ namespace OpenSim.Region.Communications.Local
             else
             {
                 // Already in our list, so the region went dead and restarted.
-                // don't replace the old regioninfo..    this might be a locking issue..  however we need to 
+                // don't replace the old regioninfo..    this might be a locking issue..  however we need to
                 // remove it and let it add normally below or we get extremely strange and intermittant
-                // connectivity errors.    
+                // connectivity errors.
                 // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you
                 // *REALLY* know what you are doing here.
                 m_regions.Remove(regionInfo.RegionHandle);
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index e8b8383..e1a6651 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -256,7 +256,6 @@ namespace OpenSim.Region.DataSnapshot
             //Boolean choice between:
             //  "PG" - Mormontown
             //  "Mature" - Sodom and Gomorrah
-            //  (Deprecated) "Patriotic Nigra Testing Sandbox" - Abandon Hope All Ye Who Enter Here
             if (scene.RegionInfo.RegionSettings.Maturity == 1)
             {
                 return "Mature";
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index e145f4a..171868b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2331,11 +2331,11 @@ namespace OpenSim.Region.Environment.Scenes
                 AttachmentPt = att.RootPart.AttachmentPoint;
 
             ScenePresence presence;
-            if(TryGetAvatar(remoteClient.AgentId, out presence))
+            if (TryGetAvatar(remoteClient.AgentId, out presence))
             {
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID);
                 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
-                if(ava != null)
+                if (ava != null)
                 {
                     ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
                 }
@@ -2346,11 +2346,11 @@ namespace OpenSim.Region.Environment.Scenes
         public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient)
         {
             ScenePresence presence;
-            if(TryGetAvatar(remoteClient.AgentId, out presence))
+            if (TryGetAvatar(remoteClient.AgentId, out presence))
             {
                 presence.Appearance.DetachAttachment(itemID);
                 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
-                if(ava != null)
+                if (ava != null)
                 {
                     ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
                 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index af7ae47..8059a78 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void MakeRootAgent(LLVector3 pos, bool isFlying)
         {
             IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>();
-            if(ava != null)
+            if (ava != null)
             {
                 ava.TryGetAvatarAppearance(m_uuid, out m_appearance);
             }
@@ -2887,7 +2887,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 System.Console.WriteLine("Attach from world {0}", itemID.ToString());
                 // Attach from world
-                if(att.ParentGroup != null)
+                if (att.ParentGroup != null)
                     m_scene.RezSingleAttachment(att.ParentGroup, ControllingClient, itemID, (uint)attachpoint, 0, 0);
             }
             else
-- 
cgit v1.1