aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorMelanie Thielker2016-07-04 03:37:45 +0100
committerMelanie Thielker2016-07-04 03:37:45 +0100
commit4468aa0dcfebb045bc54df1f67f021f85f9bc4b6 (patch)
treef52b7cf28acfe4bdbdff7ed7dfd112c6dd6b16fb /OpenSim/Framework/IClientAPI.cs
parentFinally remove the requirement for an InventoryItem/FolderBase object to (diff)
parentNew config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff)
downloadopensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip
opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz
opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2
opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c949c04..d9932eb 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1473,6 +1473,9 @@ namespace OpenSim.Framework
1473 1473
1474 void SendAgentDropGroup(UUID groupID); 1474 void SendAgentDropGroup(UUID groupID);
1475 void RefreshGroupMembership(); 1475 void RefreshGroupMembership();
1476 void UpdateGroupMembership(GroupMembershipData[] data);
1477 void GroupMembershipRemove(UUID GroupID);
1478 void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers);
1476 void SendAvatarNotesReply(UUID targetID, string text); 1479 void SendAvatarNotesReply(UUID targetID, string text);
1477 void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); 1480 void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks);
1478 void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled); 1481 void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled);