OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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)

afrisby
Jeff Ames 2007-12-05 04:16:20 +00:00
parent 77dd997ef1
commit a24b6fe924
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Environment/LandManagement/Land.cs
View File

@ -488,10 +488,9 @@ namespace OpenSim.Region.Environment.LandManagement
{ {
resultLocalIDs.Add(obj.LocalId); resultLocalIDs.Add(obj.LocalId);
} }
else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && false) // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support
//TODO: change false to group support! // {
{ // }
}
else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER && else if (request_type == LandManager.LAND_SELECT_OBJECTS_OTHER &&
obj.OwnerID != remote_client.AgentId) obj.OwnerID != remote_client.AgentId)
{ {

13
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1289,20 +1289,17 @@ namespace OpenSim.Region.Environment.Scenes
clientFlags = EveryoneMask; clientFlags = EveryoneMask;
if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanCopyPermission(remoteClient.AgentId, this.ParentGroup.UUID)) if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanCopyPermission(remoteClient.AgentId, this.ParentGroup.UUID))
{ {
clientFlags = (clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectCopy); clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectCopy;
} }
if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanMovePermission(remoteClient.AgentId, this.ParentGroup.UUID)) if (!ParentGroup.m_scene.PermissionsMngr.AnyoneCanMovePermission(remoteClient.AgentId, this.ParentGroup.UUID))
{ {
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove; clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectMove;
} }
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify; clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectModify;
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop; clientFlags &= ~(uint)LLObject.ObjectFlags.AllowInventoryDrop;
clientFlags = clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer; clientFlags &= ~(uint)LLObject.ObjectFlags.ObjectTransfer;
} }
} }