aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Permissions
diff options
context:
space:
mode:
authorDr Scofield2008-09-08 10:28:59 +0000
committerDr Scofield2008-09-08 10:28:59 +0000
commit3f9cc28103c632a030ce8ab1cda3659acc1f2e66 (patch)
treee93464d1c0178a58f9f3f716c7bec7c252a07f2f /OpenSim/Region/Environment/Modules/World/Permissions
parentUse older ExpectedException attribute format. Previously tests were failing o... (diff)
downloadopensim-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 'OpenSim/Region/Environment/Modules/World/Permissions')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs4
1 files changed, 4 insertions, 0 deletions
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