aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2007-12-05 04:16:20 +0000
committerJeff Ames2007-12-05 04:16:20 +0000
commita24b6fe924ef144a219e3ec17827477eabb8dbb4 (patch)
tree39e9431aa546b152e5e0143f4de0c1e4375d86ba
parent*disabled some confusing code regarding permissions (diff)
downloadopensim-SC_OLD-a24b6fe924ef144a219e3ec17827477eabb8dbb4.zip
opensim-SC_OLD-a24b6fe924ef144a219e3ec17827477eabb8dbb4.tar.gz
opensim-SC_OLD-a24b6fe924ef144a219e3ec17827477eabb8dbb4.tar.bz2
opensim-SC_OLD-a24b6fe924ef144a219e3ec17827477eabb8dbb4.tar.xz
fixed a few compiler warnings under mono (committed from a train, with adjohn and afrisby, enroute to a wine cave with the worst wine in the world)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/LandManagement/Land.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs13
2 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index b566387..a738bc0 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -488,10 +488,9 @@ namespace OpenSim.Region.Environment.LandManagement
488 { 488 {
489 resultLocalIDs.Add(obj.LocalId); 489 resultLocalIDs.Add(obj.LocalId);
490 } 490 }
491 else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && false) 491 // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support
492 //TODO: change false to group support! 492 // {
493 { 493 // }
494 }
495 else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER && 494 else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER &&
496 obj.OwnerID != remote_client.AgentId) 495 obj.OwnerID != remote_client.AgentId)
497 { 496 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c117d4d..19405fc 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1289,20 +1289,17 @@ namespace OpenSim.Region.Environment.Scenes
1289 clientFlags = EveryoneMask; 1289 clientFlags = EveryoneMask;
1290 if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanCopyPermission(remoteClient.AgentId, this.ParentGroup.UUID)) 1290 if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanCopyPermission(remoteClient.AgentId, this.ParentGroup.UUID))
1291 { 1291 {
1292 clientFlags = (clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectCopy); 1292 clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
1293 } 1293 }
1294 1294
1295 if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanMovePermission(remoteClient.AgentId, this.ParentGroup.UUID)) 1295 if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanMovePermission(remoteClient.AgentId, this.ParentGroup.UUID))
1296 { 1296 {
1297 clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove; 1297 clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove;
1298 } 1298 }
1299 1299
1300 clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify; 1300 clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify;
1301 clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop; 1301 clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop;
1302 clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer; 1302 clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
1303
1304
1305
1306 } 1303 }
1307 } 1304 }
1308 1305