Commit the group deeding support, thank you, mcortez
parent
b018f45b70
commit
7306b73f02
|
@ -668,6 +668,7 @@ namespace OpenSim.Client.MXP.ClientStack
|
||||||
public event ParcelGodForceOwner OnParcelGodForceOwner;
|
public event ParcelGodForceOwner OnParcelGodForceOwner;
|
||||||
public event ParcelReclaim OnParcelReclaim;
|
public event ParcelReclaim OnParcelReclaim;
|
||||||
public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
|
public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
|
||||||
|
public event ParcelDeedToGroup OnParcelDeedToGroup;
|
||||||
public event RegionInfoRequest OnRegionInfoRequest;
|
public event RegionInfoRequest OnRegionInfoRequest;
|
||||||
public event EstateCovenantRequest OnEstateCovenantRequest;
|
public event EstateCovenantRequest OnEstateCovenantRequest;
|
||||||
public event FriendActionDelegate OnApproveFriendRequest;
|
public event FriendActionDelegate OnApproveFriendRequest;
|
||||||
|
|
|
@ -192,6 +192,8 @@ namespace OpenSim.Framework
|
||||||
public delegate void ParcelReturnObjectsRequest(
|
public delegate void ParcelReturnObjectsRequest(
|
||||||
int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
|
int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
|
||||||
|
|
||||||
|
public delegate void ParcelDeedToGroup( int local_id, UUID group_id, IClientAPI remote_client);
|
||||||
|
|
||||||
public delegate void EstateOwnerMessageRequest(
|
public delegate void EstateOwnerMessageRequest(
|
||||||
UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters,
|
UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters,
|
||||||
IClientAPI remote_client);
|
IClientAPI remote_client);
|
||||||
|
@ -673,6 +675,7 @@ namespace OpenSim.Framework
|
||||||
event ParcelGodForceOwner OnParcelGodForceOwner;
|
event ParcelGodForceOwner OnParcelGodForceOwner;
|
||||||
event ParcelReclaim OnParcelReclaim;
|
event ParcelReclaim OnParcelReclaim;
|
||||||
event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
|
event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
|
||||||
|
event ParcelDeedToGroup OnParcelDeedToGroup;
|
||||||
event RegionInfoRequest OnRegionInfoRequest;
|
event RegionInfoRequest OnRegionInfoRequest;
|
||||||
event EstateCovenantRequest OnEstateCovenantRequest;
|
event EstateCovenantRequest OnEstateCovenantRequest;
|
||||||
|
|
||||||
|
|
|
@ -260,6 +260,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
private UUIDNameRequest handlerUUIDGroupNameRequest;
|
private UUIDNameRequest handlerUUIDGroupNameRequest;
|
||||||
|
|
||||||
|
private ParcelDeedToGroup handlerParcelDeedToGroup;
|
||||||
|
|
||||||
private RequestObjectPropertiesFamily handlerObjectGroupRequest;
|
private RequestObjectPropertiesFamily handlerObjectGroupRequest;
|
||||||
private ScriptReset handlerScriptReset;
|
private ScriptReset handlerScriptReset;
|
||||||
private GetScriptRunning handlerGetScriptRunning;
|
private GetScriptRunning handlerGetScriptRunning;
|
||||||
|
@ -1014,6 +1016,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
public event ParcelGodForceOwner OnParcelGodForceOwner;
|
public event ParcelGodForceOwner OnParcelGodForceOwner;
|
||||||
public event ParcelReclaim OnParcelReclaim;
|
public event ParcelReclaim OnParcelReclaim;
|
||||||
public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
|
public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
|
||||||
|
public event ParcelDeedToGroup OnParcelDeedToGroup;
|
||||||
public event RegionInfoRequest OnRegionInfoRequest;
|
public event RegionInfoRequest OnRegionInfoRequest;
|
||||||
public event EstateCovenantRequest OnEstateCovenantRequest;
|
public event EstateCovenantRequest OnEstateCovenantRequest;
|
||||||
public event FriendActionDelegate OnApproveFriendRequest;
|
public event FriendActionDelegate OnApproveFriendRequest;
|
||||||
|
@ -3441,7 +3444,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
{
|
{
|
||||||
dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
|
dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
|
||||||
dataBlock[num].Count = ownersAndCount[owner];
|
dataBlock[num].Count = ownersAndCount[owner];
|
||||||
dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added
|
|
||||||
|
if (m_GroupsModule != null)
|
||||||
|
{
|
||||||
|
//TODO: There's probably a better way to do this.
|
||||||
|
GroupProfileData gpd;
|
||||||
|
dataBlock[num].IsGroupOwned = m_GroupsModule.GetGroupProfile(owner, out gpd);
|
||||||
|
}
|
||||||
dataBlock[num].OnlineStatus = true; //TODO: fix me later
|
dataBlock[num].OnlineStatus = true; //TODO: fix me later
|
||||||
dataBlock[num].OwnerID = owner;
|
dataBlock[num].OwnerID = owner;
|
||||||
|
|
||||||
|
@ -8596,6 +8605,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
case PacketType.ParcelDeedToGroup:
|
||||||
|
ParcelDeedToGroupPacket parcelDeedToGroup = (ParcelDeedToGroupPacket)Pack;
|
||||||
|
if (m_GroupsModule != null)
|
||||||
|
{
|
||||||
|
handlerParcelDeedToGroup = OnParcelDeedToGroup;
|
||||||
|
if (handlerParcelDeedToGroup != null)
|
||||||
|
{
|
||||||
|
handlerParcelDeedToGroup(parcelDeedToGroup.Data.LocalID, parcelDeedToGroup.Data.GroupID,this);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
case PacketType.GroupNoticesListRequest:
|
case PacketType.GroupNoticesListRequest:
|
||||||
GroupNoticesListRequestPacket groupNoticesListRequest =
|
GroupNoticesListRequestPacket groupNoticesListRequest =
|
||||||
(GroupNoticesListRequestPacket)Pack;
|
(GroupNoticesListRequestPacket)Pack;
|
||||||
|
|
|
@ -166,6 +166,7 @@ namespace OpenSim.Region.Examples.SimpleModule
|
||||||
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
|
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
|
||||||
public event ParcelSelectObjects OnParcelSelectObjects;
|
public event ParcelSelectObjects OnParcelSelectObjects;
|
||||||
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
|
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
|
||||||
|
public event ParcelDeedToGroup OnParcelDeedToGroup;
|
||||||
public event ObjectDeselect OnObjectDeselect;
|
public event ObjectDeselect OnObjectDeselect;
|
||||||
public event RegionInfoRequest OnRegionInfoRequest;
|
public event RegionInfoRequest OnRegionInfoRequest;
|
||||||
public event EstateCovenantRequest OnEstateCovenantRequest;
|
public event EstateCovenantRequest OnEstateCovenantRequest;
|
||||||
|
|
|
@ -64,5 +64,14 @@ namespace OpenSim.Region.Framework.Interfaces
|
||||||
void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID);
|
void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID);
|
||||||
void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID);
|
void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID);
|
||||||
void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID);
|
void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID);
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Retrieve group profile.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="GroupID"></param>
|
||||||
|
/// <param name="GroupProfile"></param>
|
||||||
|
/// <returns>False if group does not exist</returns>
|
||||||
|
bool GetGroupProfile(UUID GroupID, out GroupProfileData GroupProfile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -270,6 +270,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
||||||
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
|
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
|
||||||
public event ParcelSelectObjects OnParcelSelectObjects;
|
public event ParcelSelectObjects OnParcelSelectObjects;
|
||||||
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
|
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
|
||||||
|
public event ParcelDeedToGroup OnParcelDeedToGroup;
|
||||||
public event ObjectDeselect OnObjectDeselect;
|
public event ObjectDeselect OnObjectDeselect;
|
||||||
public event RegionInfoRequest OnRegionInfoRequest;
|
public event RegionInfoRequest OnRegionInfoRequest;
|
||||||
public event EstateCovenantRequest OnEstateCovenantRequest;
|
public event EstateCovenantRequest OnEstateCovenantRequest;
|
||||||
|
|
|
@ -177,6 +177,7 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
|
public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
|
||||||
public event ParcelSelectObjects OnParcelSelectObjects;
|
public event ParcelSelectObjects OnParcelSelectObjects;
|
||||||
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
|
public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
|
||||||
|
public event ParcelDeedToGroup OnParcelDeedToGroup;
|
||||||
public event ObjectDeselect OnObjectDeselect;
|
public event ObjectDeselect OnObjectDeselect;
|
||||||
public event RegionInfoRequest OnRegionInfoRequest;
|
public event RegionInfoRequest OnRegionInfoRequest;
|
||||||
public event EstateCovenantRequest OnEstateCovenantRequest;
|
public event EstateCovenantRequest OnEstateCovenantRequest;
|
||||||
|
|
Loading…
Reference in New Issue