diff options
author | Dr Scofield | 2008-09-08 10:28:59 +0000 |
---|---|---|
committer | Dr Scofield | 2008-09-08 10:28:59 +0000 |
commit | 3f9cc28103c632a030ce8ab1cda3659acc1f2e66 (patch) | |
tree | e93464d1c0178a58f9f3f716c7bec7c252a07f2f /OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs | |
parent | Use older ExpectedException attribute format. Previously tests were failing o... (diff) | |
download | opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.zip opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.tar.gz opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.tar.bz2 opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.tar.xz |
fix: warnings from libomv
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs | 4 |
1 files changed, 4 insertions, 0 deletions
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 | { |