ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Thanks to _SomeOne_, Server side permissions on object editing. Be aware, that if you're editing an object on your client that you're not allowed to, it'll appear that it's moving to you, but won't actually be moving on the sim.

Browse Source
This commit is contained in:
Teravus Ovares
2007-11-29 15:24:31 +00:00
parent 0619451ea6
commit 4bd38fc65a
4 changed files with 109 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/PermissionManager.cs
View File

@@ -103,6 +103,12 @@ namespace OpenSim.Region.Environment
string reason = "Insufficient permission";
Land land = this.m_scene.LandManager.getLandObject(position.X, position.Y);
if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.CreateObjects)) == (int)Parcel.ParcelFlags.CreateObjects)
permission = true;
//TODO: check for group rights
if (IsAdministrator(user))
{
permission = true;
@@ -361,4 +367,4 @@ namespace OpenSim.Region.Environment
#endregion
}
}
}

19
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -589,11 +589,14 @@ namespace OpenSim.Region.Environment.Scenes
group.SetPartDescription(description, primLocalID);
}
public void UpdateExtraParam(uint primLocalID, ushort type, bool inUse, byte[] data)
public void UpdateExtraParam(LLUUID agentID, uint primLocalID, ushort type, bool inUse, byte[] data)
{
SceneObjectGroup group = GetGroupByPrim(primLocalID);
if (group != null)
group.UpdateExtraParam(primLocalID, type, inUse, data);
if (this.m_parentScene.PermissionsMngr.CanEditObject(agentID, group.GetPartsFullID(primLocalID)))
{
if (group != null)
group.UpdateExtraParam(primLocalID, type, inUse, data);
}
}
/// <summary>
@@ -601,11 +604,14 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
/// <param name="primLocalID"></param>
/// <param name="shapeBlock"></param>
public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
public void UpdatePrimShape(LLUUID agentID, uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
{
SceneObjectGroup group = GetGroupByPrim(primLocalID);
if (group != null)
group.UpdateShape(shapeBlock, primLocalID);
if (this.m_parentScene.PermissionsMngr.CanEditObject(agentID, group.GetPartsFullID(primLocalID)))
{
if (group != null)
group.UpdateShape(shapeBlock, primLocalID);
}
}
/// <summary>
@@ -753,3 +759,4 @@ namespace OpenSim.Region.Environment.Scenes
}
}