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

* some refactoring on permissions

Browse Source 
* temporary re-introduced the weird 'flip-back' behaviour, but debugging it; will remove it if I don't find anything.
This commit is contained in:
lbsa71
2008-02-11 13:26:55 +00:00
parent c7c567182a
commit c927928245
5 changed files with 85 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Scenes
// Update item with new asset
item.AssetID = asset.FullID;
group.UpdateInventoryItem(item);
group.GetProperites(remoteClient);
group.GetProperties(remoteClient);
// Trigger rerunning of script (use TriggerRezScript event, see RezScript)
if (isScriptRunning)
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Environment.Scenes
if (group != null)
{
int type = group.RemoveInventoryItem(localID, itemID);
group.GetProperites(remoteClient);
group.GetProperties(remoteClient);
if (type == 10)
{
EventManager.TriggerRemoveScript(localID, itemID);
@@ -599,7 +599,7 @@ namespace OpenSim.Region.Environment.Scenes
{
group.AddInventoryItem(remoteClient, localID, item, copyID);
group.StartScript(localID, copyID);
group.GetProperites(remoteClient);
group.GetProperties(remoteClient);
// m_log.Info(
// String.Format("[PRIMINVENTORY]: " +

2
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@@ -106,7 +106,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (((SceneObjectGroup) ent).LocalId == primLocalID)
{
((SceneObjectGroup) ent).GetProperites(remoteClient);
((SceneObjectGroup) ent).GetProperties(remoteClient);
((SceneObjectGroup) ent).IsSelected = true;
LandManager.setPrimsTainted();
break;

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@@ -1078,7 +1078,7 @@ namespace OpenSim.Region.Environment.Scenes
///
/// </summary>
/// <param name="client"></param>
public void GetProperites(IClientAPI client)
public void GetProperties(IClientAPI client)
{
ObjectPropertiesPacket proper = (ObjectPropertiesPacket) PacketPool.Instance.GetPacket(PacketType.ObjectProperties);
// TODO: don't create new blocks if recycling an old packet

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

@@ -1577,65 +1577,43 @@ namespace OpenSim.Region.Environment.Scenes
public void UpdatePermissions(LLUUID AgentID, byte field, uint localID, uint mask, byte addRemTF)
{
bool set = addRemTF == 1;
// Are we the owner?
if (AgentID == OwnerID)
{
m_log.Info("[PERMISSIONS]: field: " + field.ToString() + ", mask: " + mask.ToString() + " addRemTF: " +
addRemTF.ToString());
//Field 8 = EveryoneMask
if (field == (byte) 8)
switch (field)
{
m_log.Info("[PERMISSIONS]: Left over: " + (OwnerMask - EveryoneMask));
if (addRemTF == (byte) 0)
{
//EveryoneMask = (uint)0;
EveryoneMask &= ~mask;
//EveryoneMask &= ~(uint)57344;
}
else
{
//EveryoneMask = (uint)0;
EveryoneMask |= mask;
//EveryoneMask |= (uint)57344;
}
//ScheduleFullUpdate();
SendFullUpdateToAllClientsExcept(AgentID);
}
//Field 16 = NextownerMask
if (field == (byte) 16)
{
if (addRemTF == (byte) 0)
{
NextOwnerMask &= ~mask;
}
else
{
NextOwnerMask |= mask;
}
SendFullUpdateToAllClientsExcept(AgentID);
}
if (field == (byte)2)
{
if (addRemTF == (byte)0)
{
//m_parentGroup.SetLocked(true);
//PermissionMask.
OwnerMask &= ~mask;
}
else
{
//m_parentGroup.SetLocked(false);
OwnerMask |= mask;
}
SendFullUpdateToAllClients();
case 2:
OwnerMask = ApplyMask(OwnerMask, set, mask);
break;
case 4:
GroupMask = ApplyMask(GroupMask, set, mask);
break;
case 8:
EveryoneMask = ApplyMask(EveryoneMask, set, mask);
break;
case 16:
NextOwnerMask = ApplyMask(NextOwnerMask, set, mask);
break;
}
ScheduleFullUpdate();
}
}
private uint ApplyMask(uint val, bool set, uint mask)
{
if (set)
{
return val |= mask;
}
else
{
return val &= ~mask;
}
}
#region Client Update Methods
public void AddFullUpdateToAllAvatars()