From a24b6fe924ef144a219e3ec17827477eabb8dbb4 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 5 Dec 2007 04:16:20 +0000
Subject: fixed a few compiler warnings under mono (committed from a train,
 with adjohn and afrisby, enroute to a wine cave with the worst wine in the
 world)

---
 OpenSim/Region/Environment/LandManagement/Land.cs    |  7 +++----
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 13 +++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index b566387..a738bc0 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -488,10 +488,9 @@ namespace OpenSim.Region.Environment.LandManagement
                     {
                         resultLocalIDs.Add(obj.LocalId);
                     }
-                    else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && false)
-                        //TODO: change false to group support!
-                    {
-                    }
+                    // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support
+                    // {
+                    // }
                     else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER &&
                              obj.OwnerID != remote_client.AgentId)
                     {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c117d4d..19405fc 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1289,20 +1289,17 @@ namespace OpenSim.Region.Environment.Scenes
                     clientFlags = EveryoneMask;
                     if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanCopyPermission(remoteClient.AgentId, this.ParentGroup.UUID))
                     {
-                        clientFlags = (clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectCopy);
+                        clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
                     }
 
                     if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanMovePermission(remoteClient.AgentId, this.ParentGroup.UUID))
                     {
-                        clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove;
+                        clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove;
                     }
                     
-                    clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify;
-                    clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop;
-                    clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
-
-
-
+                    clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify;
+                    clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop;
+                    clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
                 }
             }
 
-- 
cgit v1.1