aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-15 21:07:09 +0000
committerMelanie Thielker2009-04-15 21:07:09 +0000
commit7306b73f02231687577425cb2e905c51bfbfdfc1 (patch)
treec6d29aee37a9cfbeba38ebe3c669decafcbdfca2
parentMake sim health data more useful (diff)
downloadopensim-SC_OLD-7306b73f02231687577425cb2e905c51bfbfdfc1.zip
opensim-SC_OLD-7306b73f02231687577425cb2e905c51bfbfdfc1.tar.gz
opensim-SC_OLD-7306b73f02231687577425cb2e905c51bfbfdfc1.tar.bz2
opensim-SC_OLD-7306b73f02231687577425cb2e905c51bfbfdfc1.tar.xz
Commit the group deeding support, thank you, mcortez
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs1
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs28
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/IGroupsModule.cs9
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs1
7 files changed, 43 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index d7afb4e..04b9c38 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -668,6 +668,7 @@ namespace OpenSim.Client.MXP.ClientStack
668 public event ParcelGodForceOwner OnParcelGodForceOwner; 668 public event ParcelGodForceOwner OnParcelGodForceOwner;
669 public event ParcelReclaim OnParcelReclaim; 669 public event ParcelReclaim OnParcelReclaim;
670 public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest; 670 public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
671 public event ParcelDeedToGroup OnParcelDeedToGroup;
671 public event RegionInfoRequest OnRegionInfoRequest; 672 public event RegionInfoRequest OnRegionInfoRequest;
672 public event EstateCovenantRequest OnEstateCovenantRequest; 673 public event EstateCovenantRequest OnEstateCovenantRequest;
673 public event FriendActionDelegate OnApproveFriendRequest; 674 public event FriendActionDelegate OnApproveFriendRequest;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 064e965..27cf44f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -192,6 +192,8 @@ namespace OpenSim.Framework
192 public delegate void ParcelReturnObjectsRequest( 192 public delegate void ParcelReturnObjectsRequest(
193 int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client); 193 int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
194 194
195 public delegate void ParcelDeedToGroup( int local_id, UUID group_id, IClientAPI remote_client);
196
195 public delegate void EstateOwnerMessageRequest( 197 public delegate void EstateOwnerMessageRequest(
196 UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters, 198 UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters,
197 IClientAPI remote_client); 199 IClientAPI remote_client);
@@ -673,6 +675,7 @@ namespace OpenSim.Framework
673 event ParcelGodForceOwner OnParcelGodForceOwner; 675 event ParcelGodForceOwner OnParcelGodForceOwner;
674 event ParcelReclaim OnParcelReclaim; 676 event ParcelReclaim OnParcelReclaim;
675 event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest; 677 event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
678 event ParcelDeedToGroup OnParcelDeedToGroup;
676 event RegionInfoRequest OnRegionInfoRequest; 679 event RegionInfoRequest OnRegionInfoRequest;
677 event EstateCovenantRequest OnEstateCovenantRequest; 680 event EstateCovenantRequest OnEstateCovenantRequest;
678 681
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7340628..b506434 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -260,6 +260,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
260 260
261 private UUIDNameRequest handlerUUIDGroupNameRequest; 261 private UUIDNameRequest handlerUUIDGroupNameRequest;
262 262
263 private ParcelDeedToGroup handlerParcelDeedToGroup;
264
263 private RequestObjectPropertiesFamily handlerObjectGroupRequest; 265 private RequestObjectPropertiesFamily handlerObjectGroupRequest;
264 private ScriptReset handlerScriptReset; 266 private ScriptReset handlerScriptReset;
265 private GetScriptRunning handlerGetScriptRunning; 267 private GetScriptRunning handlerGetScriptRunning;
@@ -1014,6 +1016,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1014 public event ParcelGodForceOwner OnParcelGodForceOwner; 1016 public event ParcelGodForceOwner OnParcelGodForceOwner;
1015 public event ParcelReclaim OnParcelReclaim; 1017 public event ParcelReclaim OnParcelReclaim;
1016 public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest; 1018 public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
1019 public event ParcelDeedToGroup OnParcelDeedToGroup;
1017 public event RegionInfoRequest OnRegionInfoRequest; 1020 public event RegionInfoRequest OnRegionInfoRequest;
1018 public event EstateCovenantRequest OnEstateCovenantRequest; 1021 public event EstateCovenantRequest OnEstateCovenantRequest;
1019 public event FriendActionDelegate OnApproveFriendRequest; 1022 public event FriendActionDelegate OnApproveFriendRequest;
@@ -3441,7 +3444,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3441 { 3444 {
3442 dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock(); 3445 dataBlock[num] = new ParcelObjectOwnersReplyPacket.DataBlock();
3443 dataBlock[num].Count = ownersAndCount[owner]; 3446 dataBlock[num].Count = ownersAndCount[owner];
3444 dataBlock[num].IsGroupOwned = false; //TODO: fix me when group support is added 3447
3448 if (m_GroupsModule != null)
3449 {
3450 //TODO: There's probably a better way to do this.
3451 GroupProfileData gpd;
3452 dataBlock[num].IsGroupOwned = m_GroupsModule.GetGroupProfile(owner, out gpd);
3453 }
3445 dataBlock[num].OnlineStatus = true; //TODO: fix me later 3454 dataBlock[num].OnlineStatus = true; //TODO: fix me later
3446 dataBlock[num].OwnerID = owner; 3455 dataBlock[num].OwnerID = owner;
3447 3456
@@ -8596,6 +8605,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8596 } 8605 }
8597 8606
8598 break; 8607 break;
8608
8609
8610 case PacketType.ParcelDeedToGroup:
8611 ParcelDeedToGroupPacket parcelDeedToGroup = (ParcelDeedToGroupPacket)Pack;
8612 if (m_GroupsModule != null)
8613 {
8614 handlerParcelDeedToGroup = OnParcelDeedToGroup;
8615 if (handlerParcelDeedToGroup != null)
8616 {
8617 handlerParcelDeedToGroup(parcelDeedToGroup.Data.LocalID, parcelDeedToGroup.Data.GroupID,this);
8618
8619 }
8620 }
8621
8622 break;
8623
8624
8599 case PacketType.GroupNoticesListRequest: 8625 case PacketType.GroupNoticesListRequest:
8600 GroupNoticesListRequestPacket groupNoticesListRequest = 8626 GroupNoticesListRequestPacket groupNoticesListRequest =
8601 (GroupNoticesListRequestPacket)Pack; 8627 (GroupNoticesListRequestPacket)Pack;
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index a6e55f4..0e9d255 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -166,6 +166,7 @@ namespace OpenSim.Region.Examples.SimpleModule
166 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest; 166 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
167 public event ParcelSelectObjects OnParcelSelectObjects; 167 public event ParcelSelectObjects OnParcelSelectObjects;
168 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; 168 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
169 public event ParcelDeedToGroup OnParcelDeedToGroup;
169 public event ObjectDeselect OnObjectDeselect; 170 public event ObjectDeselect OnObjectDeselect;
170 public event RegionInfoRequest OnRegionInfoRequest; 171 public event RegionInfoRequest OnRegionInfoRequest;
171 public event EstateCovenantRequest OnEstateCovenantRequest; 172 public event EstateCovenantRequest OnEstateCovenantRequest;
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index dad08ba..85b8cac 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -64,5 +64,14 @@ namespace OpenSim.Region.Framework.Interfaces
64 void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID); 64 void LeaveGroupRequest(IClientAPI remoteClient, UUID GroupID);
65 void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID); 65 void EjectGroupMemberRequest(IClientAPI remoteClient, UUID GroupID, UUID EjecteeID);
66 void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID); 66 void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID);
67
68
69 /// <summary>
70 /// Retrieve group profile.
71 /// </summary>
72 /// <param name="GroupID"></param>
73 /// <param name="GroupProfile"></param>
74 /// <returns>False if group does not exist</returns>
75 bool GetGroupProfile(UUID GroupID, out GroupProfileData GroupProfile);
67 } 76 }
68} 77}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 8b733cd..aff26b6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -270,6 +270,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
270 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest; 270 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
271 public event ParcelSelectObjects OnParcelSelectObjects; 271 public event ParcelSelectObjects OnParcelSelectObjects;
272 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; 272 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
273 public event ParcelDeedToGroup OnParcelDeedToGroup;
273 public event ObjectDeselect OnObjectDeselect; 274 public event ObjectDeselect OnObjectDeselect;
274 public event RegionInfoRequest OnRegionInfoRequest; 275 public event RegionInfoRequest OnRegionInfoRequest;
275 public event EstateCovenantRequest OnEstateCovenantRequest; 276 public event EstateCovenantRequest OnEstateCovenantRequest;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 0f75d70..15e92da 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -177,6 +177,7 @@ namespace OpenSim.Tests.Common.Mock
177 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest; 177 public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
178 public event ParcelSelectObjects OnParcelSelectObjects; 178 public event ParcelSelectObjects OnParcelSelectObjects;
179 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; 179 public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
180 public event ParcelDeedToGroup OnParcelDeedToGroup;
180 public event ObjectDeselect OnObjectDeselect; 181 public event ObjectDeselect OnObjectDeselect;
181 public event RegionInfoRequest OnRegionInfoRequest; 182 public event RegionInfoRequest OnRegionInfoRequest;
182 public event EstateCovenantRequest OnEstateCovenantRequest; 183 public event EstateCovenantRequest OnEstateCovenantRequest;