From 7fefb80abbde4bd8a9b19cb631736b5860274134 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Fri, 16 May 2008 13:33:57 +0000
Subject: Minor cleanup.

---
 OpenSim/Region/Environment/Scenes/Scene.cs         | 23 ++++++----------------
 .../Region/Environment/Scenes/SceneObjectPart.cs   |  2 +-
 OpenSim/Region/Environment/Scenes/ScenePresence.cs |  2 +-
 .../Modules/SvnSerialiser/SvnBackupModule.cs       |  2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 32dc7d5..bc80915 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1284,10 +1284,9 @@ namespace OpenSim.Region.Environment.Scenes
                                        byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID,
                                        byte RayEndIsIntersection)
         {
+            LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f, 0.5f, 0.5f), false);
 
-            LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false);
-
-            if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos))
+            if (ExternalChecks.ExternalChecksCanRezObject(1, ownerID, pos))
             {
                 // rez ON the ground, not IN the ground
                 pos.Z += 0.25F;
@@ -1515,8 +1514,6 @@ namespace OpenSim.Region.Environment.Scenes
                                 }
                             }
                         }
-
-
                     }
                 }
                 return true;
@@ -1525,7 +1522,6 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 return false;
             }
-
         }
 
         #endregion
@@ -1658,6 +1654,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             EventManager.TriggerOnNewClient(client);
         }
+
         public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client)
         {
             UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(AgentId);
@@ -1701,7 +1698,7 @@ namespace OpenSim.Region.Environment.Scenes
                     EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false);
 
                     // Un-comment out the following line to Get Raytrace results printed to the console.
-                   // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
+                    // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
                     float ScaleOffset = 0.5f;
 
                     // If we hit something
@@ -1745,18 +1742,13 @@ namespace OpenSim.Region.Environment.Scenes
                         m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
                     }
 
-
                     return;
                 }
-                return;
-
 
+                return;
             }
-
-
-
-
         }
+
         public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags)
         {
             UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId);
@@ -1938,7 +1930,6 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
             }
-
         }
 
         public override void CloseAllAgents(uint circuitcode)
@@ -2014,7 +2005,6 @@ namespace OpenSim.Region.Environment.Scenes
             m_sceneGridService.Close();
         }
 
-
         /// <summary>
         /// Do the work necessary to initiate a new user connection.
         /// At the moment, this consists of setting up the caps infrastructure
@@ -2164,7 +2154,6 @@ namespace OpenSim.Region.Environment.Scenes
                     childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
                     // Not Implemented:
                     //TODO: Do we need to pass the message on to one of our neighbors?
-
                 }
                 return true;
             }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a52d5f9..80b93b1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1282,7 +1282,7 @@ namespace OpenSim.Region.Environment.Scenes
                     //}
                 //}
                 //a = (d - iray.Origin.Dot(normals[i])) / s;
-                //if ( iray.Direction.Dot(normals[i]) < 0)
+                //if (iray.Direction.Dot(normals[i]) < 0)
                 //{
                     //if (a > fmax)
                     //{
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index ba8bbd9..44805cc 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2312,7 +2312,7 @@ namespace OpenSim.Region.Environment.Scenes
             /*
             Dictionary<Guid, ScenePartUpdate> updateTimes_work = new Dictionary<Guid, ScenePartUpdate>();
 
-            foreach ( LLUUID id in m_updateTimes.Keys)
+            foreach (LLUUID id in m_updateTimes.Keys)
             {
                 updateTimes_work.Add(id.UUID, m_updateTimes[id]);
             }
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index 6cca36d..94d2ec0 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
             }
 
             m_svnClient.Commit3(svnfilenames, true, false);
-            m_log.Info("[SVNBACKUP]: Server backup successful ( " + String.Concat(regions.ToArray()) + ").");
+            m_log.Info("[SVNBACKUP]: Server backup successful (" + String.Concat(regions.ToArray()) + ").");
         }
 
         private List<string> CreateAndAddExport(Scene scene)
-- 
cgit v1.1