aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-15 21:07:09 +0000
committerMelanie Thielker2009-04-15 21:07:09 +0000
commit7306b73f02231687577425cb2e905c51bfbfdfc1 (patch)
treec6d29aee37a9cfbeba38ebe3c669decafcbdfca2 /OpenSim/Region/ClientStack
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
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs28
1 files changed, 27 insertions, 1 deletions
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;