aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs4
5 files changed, 17 insertions, 1 deletions
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
105 105
106 m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene"); 106 m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene");
107 107
108 // libomv will complain about PrimFlags.JointWheel
109 // being obsolete, so we...
110 #pragma warning disable 0612
108 if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) { 111 if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) {
109 XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", ""); 112 XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
110 113
@@ -142,6 +145,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
142 } 145 }
143 parent.AppendChild(xmlobject); 146 parent.AppendChild(xmlobject);
144 } 147 }
148 #pragma warning disable 0612
145 } 149 }
146 } 150 }
147 this.Stale = false; 151 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
78 //Scale size of particles to distance objects are apart (for better visibility) 78 //Scale size of particles to distance objects are apart (for better visibility)
79 Vector3 FromPos = From.GetWorldPosition(); 79 Vector3 FromPos = From.GetWorldPosition();
80 Vector3 ToPos = From.GetWorldPosition(); 80 Vector3 ToPos = From.GetWorldPosition();
81 UUID toUUID = To.UUID; 81 // UUID toUUID = To.UUID;
82 float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + 82 float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) +
83 Math.Pow(FromPos.X-ToPos.Y, 2) + 83 Math.Pow(FromPos.X-ToPos.Y, 2) +
84 Math.Pow(FromPos.X-ToPos.Z, 2) 84 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
312 // Remove any of the objectFlags that are temporary. These will get added back if appropriate 312 // Remove any of the objectFlags that are temporary. These will get added back if appropriate
313 // in the next bit of code 313 // in the next bit of code
314 314
315 // libomv will moan about PrimFlags.ObjectYouOfficer being
316 // deprecated
317 #pragma warning disable 0612
315 objflags &= (uint) 318 objflags &= (uint)
316 ~(PrimFlags.ObjectCopy | // Tells client you can copy the object 319 ~(PrimFlags.ObjectCopy | // Tells client you can copy the object
317 PrimFlags.ObjectModify | // tells client you can modify the object 320 PrimFlags.ObjectModify | // tells client you can modify the object
@@ -322,6 +325,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
322 PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object 325 PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object
323 PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set 326 PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set
324 ); 327 );
328 #pragma warning restore 0612
325 329
326 // Creating the three ObjectFlags options for this method to choose from. 330 // Creating the three ObjectFlags options for this method to choose from.
327 // Customize the OwnerMask 331 // 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
1509 // * Asset/DRM permission bit "modify" is enabled 1509 // * Asset/DRM permission bit "modify" is enabled
1510 //use CanEditObjectPosition 1510 //use CanEditObjectPosition
1511 1511
1512 // libomv will complain about PrimFlags.JointWheel being
1513 // deprecated, so we
1514 #pragma warning disable 0612
1512 if (IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanEditObject(objid, user)) 1515 if (IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanEditObject(objid, user))
1513 { 1516 {
1514 obj.ParentGroup.RootPart.AddFlag(PrimFlags.JointWheel); 1517 obj.ParentGroup.RootPart.AddFlag(PrimFlags.JointWheel);
@@ -1517,6 +1520,7 @@ namespace OpenSim.Region.Environment.Scenes
1517 { 1520 {
1518 obj.ParentGroup.RootPart.RemFlag(PrimFlags.JointWheel); 1521 obj.ParentGroup.RootPart.RemFlag(PrimFlags.JointWheel);
1519 } 1522 }
1523 #pragma warning restore 0612
1520 } 1524 }
1521 1525
1522 /// <summary> 1526 /// <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
67 if (part == null) 67 if (part == null)
68 return 0; 68 return 0;
69 69
70 // libomv will moan about PrimFlags.ObjectYouOfficer being
71 // obsolete...
72 #pragma warning disable 0612
70 uint perms=part.GetEffectiveObjectFlags() | 73 uint perms=part.GetEffectiveObjectFlags() |
71 (uint)PrimFlags.ObjectModify | 74 (uint)PrimFlags.ObjectModify |
72 (uint)PrimFlags.ObjectCopy | 75 (uint)PrimFlags.ObjectCopy |
@@ -76,6 +79,7 @@ namespace OpenSim.Region.Environment.Scenes
76 (uint)PrimFlags.ObjectAnyOwner | 79 (uint)PrimFlags.ObjectAnyOwner |
77 (uint)PrimFlags.ObjectOwnerModify | 80 (uint)PrimFlags.ObjectOwnerModify |
78 (uint)PrimFlags.ObjectYouOfficer; 81 (uint)PrimFlags.ObjectYouOfficer;
82 #pragma warning restore 0612
79 83
80 foreach (GenerateClientFlags check in GenerateClientFlagsCheckFunctions) 84 foreach (GenerateClientFlags check in GenerateClientFlagsCheckFunctions)
81 { 85 {