From 3f9cc28103c632a030ce8ab1cda3659acc1f2e66 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Mon, 8 Sep 2008 10:28:59 +0000
Subject: fix: warnings from libomv

---
 OpenSim/Region/DataSnapshot/ObjectSnapshot.cs                         | 4 ++++
 .../Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs     | 2 +-
 .../Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 4 ++++
 OpenSim/Region/Environment/Scenes/InnerScene.cs                       | 4 ++++
 OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs              | 4 ++++
 5 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index c23c697..ba797ba 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -105,6 +105,9 @@ namespace OpenSim.Region.DataSnapshot.Providers
 
                     m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene");
 
+                    // libomv will complain about PrimFlags.JointWheel
+                    // being obsolete, so we...
+                    #pragma warning disable 0612
                     if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) {
                         XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
 
@@ -142,6 +145,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
                         }
                         parent.AppendChild(xmlobject);
                     }
+                    #pragma warning disable 0612
                 }
             }
             this.Stale = false;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
index b27bbc0..301de56 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
             //Scale size of particles to distance objects are apart (for better visibility)
             Vector3 FromPos = From.GetWorldPosition();
             Vector3 ToPos = From.GetWorldPosition();
-            UUID toUUID = To.UUID;
+            // UUID toUUID = To.UUID;
             float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + 
                                                 Math.Pow(FromPos.X-ToPos.Y, 2) + 
                                                 Math.Pow(FromPos.X-ToPos.Z, 2)
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index d92f33a..3b4819b 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -312,6 +312,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             // Remove any of the objectFlags that are temporary.  These will get added back if appropriate
             // in the next bit of code
 
+            // libomv will moan about PrimFlags.ObjectYouOfficer being
+            // deprecated
+            #pragma warning disable 0612 
             objflags &= (uint)
                 ~(PrimFlags.ObjectCopy | // Tells client you can copy the object
                   PrimFlags.ObjectModify | // tells client you can modify the object
@@ -322,6 +325,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                   PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object
                   PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set
                     );
+            #pragma warning restore 0612
 
             // Creating the three ObjectFlags options for this method to choose from.
             // Customize the OwnerMask
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index e61fb19..53b0a38 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1509,6 +1509,9 @@ namespace OpenSim.Region.Environment.Scenes
             // * Asset/DRM permission bit "modify" is enabled
             //use CanEditObjectPosition
 
+            // libomv will complain about PrimFlags.JointWheel being
+            // deprecated, so we
+            #pragma warning disable 0612
             if (IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanEditObject(objid, user))
             {
                 obj.ParentGroup.RootPart.AddFlag(PrimFlags.JointWheel);
@@ -1517,6 +1520,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 obj.ParentGroup.RootPart.RemFlag(PrimFlags.JointWheel);
             }
+            #pragma warning restore 0612
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
index a2a4b2d..678d707 100644
--- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
@@ -67,6 +67,9 @@ namespace OpenSim.Region.Environment.Scenes
             if (part == null)
                 return 0;
 
+            // libomv will moan about PrimFlags.ObjectYouOfficer being
+            // obsolete...
+            #pragma warning disable 0612
             uint perms=part.GetEffectiveObjectFlags() |
                 (uint)PrimFlags.ObjectModify |
                 (uint)PrimFlags.ObjectCopy |
@@ -76,6 +79,7 @@ namespace OpenSim.Region.Environment.Scenes
                 (uint)PrimFlags.ObjectAnyOwner |
                 (uint)PrimFlags.ObjectOwnerModify |
                 (uint)PrimFlags.ObjectYouOfficer;
+            #pragma warning restore 0612
 
             foreach (GenerateClientFlags check in GenerateClientFlagsCheckFunctions)
             {
-- 
cgit v1.1