OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests 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.

afrisby
Teravus Ovares 2007-11-29 15:24:31 +00:00
parent 0619451ea6
commit 4bd38fc65a
4 changed files with 109 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/IClientAPI.cs
View File

@ -211,9 +211,9 @@ namespace OpenSim.Framework
public delegate void GenericCall7(uint localID, string message); public delegate void GenericCall7(uint localID, string message);
public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); public delegate void UpdateShape(LLUUID agentID, uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data); public delegate void ObjectExtraParams(LLUUID agentID, uint localID, ushort type, bool inUse, byte[] data);
public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);

169
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -2014,116 +2014,121 @@ namespace OpenSim.Region.ClientStack
{ {
MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket) packet; MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket) packet;
// System.Console.WriteLine("new multi update packet " + multipleupdate.ToString()); // System.Console.WriteLine("new multi update packet " + multipleupdate.ToString());
OpenSim.Region.Environment.Scenes.Scene tScene = (OpenSim.Region.Environment.Scenes.Scene)this.m_scene;
for (int i = 0; i < multipleupdate.ObjectData.Length; i++) for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
{ {
#region position if (tScene.PermissionsMngr.CanEditObject(simClient.AgentId, tScene.GetSceneObjectPart(multipleupdate.ObjectData[i].ObjectLocalID).UUID))
{
#region position
if (multipleupdate.ObjectData[i].Type == 9) //change position if (multipleupdate.ObjectData[i].Type == 9) //change position
{
if (OnUpdatePrimGroupPosition != null)
{ {
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); if (OnUpdatePrimGroupPosition != null)
OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); {
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position
else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position
{
if (OnUpdatePrimSinglePosition != null)
{ {
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); if (OnUpdatePrimSinglePosition != null)
// System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); {
OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
// System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
} }
}
#endregion position #endregion position
#region rotation #region rotation
else if (multipleupdate.ObjectData[i].Type == 2) // single item of group rotation from tab else if (multipleupdate.ObjectData[i].Type == 2) // single item of group rotation from tab
{
if (OnUpdatePrimSingleRotation != null)
{ {
LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); if (OnUpdatePrimSingleRotation != null)
//System.Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); {
OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
//System.Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 3) // single item of group rotation from mouse
else if (multipleupdate.ObjectData[i].Type == 3) // single item of group rotation from mouse
{
if (OnUpdatePrimSingleRotation != null)
{ {
LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true); if (OnUpdatePrimSingleRotation != null)
//System.Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); {
OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
//System.Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 10) //group rotation from object tab
else if (multipleupdate.ObjectData[i].Type == 10) //group rotation from object tab
{
if (OnUpdatePrimGroupRotation != null)
{ {
LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); if (OnUpdatePrimGroupRotation != null)
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); {
OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this); LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 11) //group rotation from mouse
else if (multipleupdate.ObjectData[i].Type == 11) //group rotation from mouse
{
if (OnUpdatePrimGroupMouseRotation != null)
{ {
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); if (OnUpdatePrimGroupMouseRotation != null)
LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true); {
//Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this); //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
// Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
}
} }
}
#endregion #endregion
#region scale #region scale
else if (multipleupdate.ObjectData[i].Type == 13) //group scale from object tab else if (multipleupdate.ObjectData[i].Type == 13) //group scale from object tab
{
if (OnUpdatePrimScale != null)
{ {
LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); if (OnUpdatePrimScale != null)
//Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); {
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
//Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
// Change the position based on scale (for bug number 246) // Change the position based on scale (for bug number 246)
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
// System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 29) //group scale from mouse
else if (multipleupdate.ObjectData[i].Type == 29) //group scale from mouse
{
if (OnUpdatePrimScale != null)
{ {
LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); if (OnUpdatePrimScale != null)
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z ); {
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z );
OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this); OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 5) //single prim scale from object tab
else if (multipleupdate.ObjectData[i].Type == 5) //single prim scale from object tab
{
if (OnUpdatePrimScale != null)
{ {
LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); if (OnUpdatePrimScale != null)
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); {
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
} }
} else if (multipleupdate.ObjectData[i].Type == 21) //single prim scale from mouse
else if (multipleupdate.ObjectData[i].Type == 21) //single prim scale from mouse
{
if (OnUpdatePrimScale != null)
{ {
LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); if (OnUpdatePrimScale != null)
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); {
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this); LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
// Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
}
} }
}
#endregion #endregion
}
} }
return true; return true;
} }
@ -2757,7 +2762,7 @@ namespace OpenSim.Region.ClientStack
{ {
if (OnUpdatePrimShape != null) if (OnUpdatePrimShape != null)
{ {
OnUpdatePrimShape(shapePacket.ObjectData[i].ObjectLocalID, shapePacket.ObjectData[i]); OnUpdatePrimShape(this.m_agentId, shapePacket.ObjectData[i].ObjectLocalID, shapePacket.ObjectData[i]);
} }
} }
break; break;
@ -2765,7 +2770,7 @@ namespace OpenSim.Region.ClientStack
ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket) Pack; ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket) Pack;
if (OnUpdateExtraParams != null) if (OnUpdateExtraParams != null)
{ {
OnUpdateExtraParams(extraPar.ObjectData[0].ObjectLocalID, extraPar.ObjectData[0].ParamType, OnUpdateExtraParams(this.m_agentId, extraPar.ObjectData[0].ObjectLocalID, extraPar.ObjectData[0].ParamType,
extraPar.ObjectData[0].ParamInUse, extraPar.ObjectData[0].ParamData); extraPar.ObjectData[0].ParamInUse, extraPar.ObjectData[0].ParamData);
} }
break; break;
@ -3642,4 +3647,4 @@ namespace OpenSim.Region.ClientStack
OutPacket(logReply, ThrottleOutPacketType.Task); OutPacket(logReply, ThrottleOutPacketType.Task);
} }
} }
} }

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

@ -103,6 +103,12 @@ namespace OpenSim.Region.Environment
string reason = "Insufficient permission"; 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)) if (IsAdministrator(user))
{ {
permission = true; permission = true;
@ -361,4 +367,4 @@ namespace OpenSim.Region.Environment
#endregion #endregion
} }
} }

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

@ -589,11 +589,14 @@ namespace OpenSim.Region.Environment.Scenes
group.SetPartDescription(description, primLocalID); 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); SceneObjectGroup group = GetGroupByPrim(primLocalID);
if (group != null) if (this.m_parentScene.PermissionsMngr.CanEditObject(agentID, group.GetPartsFullID(primLocalID)))
group.UpdateExtraParam(primLocalID, type, inUse, data); {
if (group != null)
group.UpdateExtraParam(primLocalID, type, inUse, data);
}
} }
/// <summary> /// <summary>
@ -601,11 +604,14 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
/// <param name="primLocalID"></param> /// <param name="primLocalID"></param>
/// <param name="shapeBlock"></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); SceneObjectGroup group = GetGroupByPrim(primLocalID);
if (group != null) if (this.m_parentScene.PermissionsMngr.CanEditObject(agentID, group.GetPartsFullID(primLocalID)))
group.UpdateShape(shapeBlock, primLocalID); {
if (group != null)
group.UpdateShape(shapeBlock, primLocalID);
}
} }
/// <summary> /// <summary>
@ -753,3 +759,4 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }