From a7fcacf8f396acbca0b640a65acfbf5487d513e7 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Tue, 9 Jun 2009 18:07:35 +0000
Subject: Formatting cleanup. Ignore some generated files.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 36 +++++++++++-----------
 OpenSim/Region/Framework/Scenes/Scene.cs           |  6 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a2a7392..8e3c688 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1526,14 +1526,14 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
 
                 if (part.OwnerID != remoteClient.AgentId)
-		{
-		    // Group permissions
-		    if ( (part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0) )
-			return;
-		} else {
-		    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-			return;
-		}
+                {
+                    // Group permissions
+                    if ((part.GroupID == UUID.Zero) || (remoteClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0))
+                        return;
+                } else {
+                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                        return;
+                }
 
                 if (!Permissions.CanCreateObjectInventory(
                     itemBase.InvType, part.UUID, remoteClient.AgentId))
@@ -1602,18 +1602,18 @@ namespace OpenSim.Region.Framework.Scenes
                         destId);
                 return;
             }
-	    
+        
             // Must own the object, and have modify rights
             if (srcPart.OwnerID != destPart.OwnerID)
-	    {
-		// Group permissions
-		if ( (destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
-		((destPart.GroupMask & (uint)PermissionMask.Modify) == 0) )
-		    return;
-	    } else {
-		if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
-		    return;
-	    }
+            {
+                // Group permissions
+                if ((destPart.GroupID == UUID.Zero) || (destPart.GroupID != srcPart.GroupID) ||
+                    ((destPart.GroupMask & (uint)PermissionMask.Modify) == 0))
+                    return;
+            } else {
+                if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                    return;
+            }
 
             if (destPart.ScriptAccessPin != pin)
             {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9cfc84f..d18af46 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_AssetService = RequestModuleInterface<IAssetService>();
 
-                    if( m_AssetService == null )
+                    if (m_AssetService == null)
                     {
                         throw new Exception("No IAssetService available.");
                     }
@@ -1097,7 +1097,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>();
                     if (tr != null)
-                        tr.SendInstantMessage(msg, delegate(bool success) {} );
+                        tr.SendInstantMessage(msg, delegate(bool success) {});
                 }
                 m_returns.Clear();
             }
@@ -1465,7 +1465,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             foreach (SceneObjectPart part in group.Children.Values)
             {
-                if (part.IsJoint() && ((part.ObjectFlags&(uint)PrimFlags.Physics) != 0) )
+                if (part.IsJoint() && ((part.ObjectFlags&(uint)PrimFlags.Physics) != 0))
                 {
                     PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
                 }
-- 
cgit v1.1