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

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-09-17 12:44:52 +01:00
parent 606e9f99f3 2338d3d2e5
commit e5383604cb
21 changed files with 701 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -6108,7 +6108,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
AddLocalPacketHandler(PacketType.RevokePermissions, HandleRevokePermissions);
AddGenericPacketHandler("autopilot", HandleAutopilot);
}
@@ -10997,6 +10997,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return true;
}
private bool HandleInventoryDescendents(IClientAPI sender, Packet Pack)
{
return true;
@@ -12371,6 +12372,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return true;
}
private bool HandleRevokePermissions(IClientAPI sender, Packet Pack)
{
RevokePermissionsPacket pkt = (RevokePermissionsPacket)Pack;
if (pkt.AgentData.SessionID != SessionId ||
pkt .AgentData.AgentID != AgentId)
return true;
// don't use multidelegate "event"
ScenePresence sp = (ScenePresence)SceneAgent;
if(sp != null && !sp.IsDeleted && !sp.IsInTransit)
{
UUID objectID = pkt.Data.ObjectID;
uint permissions = pkt.Data.ObjectPermissions;
sp.HandleRevokePermissions(objectID , permissions);
}
return true;
}
private bool HandlePlacesQuery(IClientAPI sender, Packet Pack)
{
PlacesQueryPacket placesQueryPacket =