fix: warnings from libomv

This commit is contained in:
Dr Scofield
2008-09-08 10:28:59 +00:00
parent 3cf92cb511
commit 3f9cc28103
5 changed files with 17 additions and 1 deletions

View File

@@ -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>

View File

@@ -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)
{