aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
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/Scenes
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/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs4
2 files changed, 8 insertions, 0 deletions
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 {