aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2016-03-09 02:45:11 +0100
committerMelanie Thielker2016-03-09 02:45:11 +0100
commit43ca32150c1856f7b3768172fec2d06b8f5e5bef (patch)
tree33a1b0df4860d769157beb19c60c5c97d305367d /OpenSim/Framework
parentMake mesh upload respect the same parts maximum as what is set for the (diff)
downloadopensim-SC_OLD-43ca32150c1856f7b3768172fec2d06b8f5e5bef.zip
opensim-SC_OLD-43ca32150c1856f7b3768172fec2d06b8f5e5bef.tar.gz
opensim-SC_OLD-43ca32150c1856f7b3768172fec2d06b8f5e5bef.tar.bz2
opensim-SC_OLD-43ca32150c1856f7b3768172fec2d06b8f5e5bef.tar.xz
Plumb RezRestoreToWorld from the client (part done)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 85edce3..696b0ef 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Framework
51 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 51 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
52 bool RezSelected, bool RemoveItem, UUID fromTaskID); 52 bool RezSelected, bool RemoveItem, UUID fromTaskID);
53 53
54 public delegate void RezRestoreToWorld(IClientAPI remoteClient, UUID itemId);
54 public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); 55 public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
55 56
56 public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist ); 57 public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist );
@@ -818,6 +819,7 @@ namespace OpenSim.Framework
818 event TeleportLandmarkRequest OnTeleportLandmarkRequest; 819 event TeleportLandmarkRequest OnTeleportLandmarkRequest;
819 event TeleportCancel OnTeleportCancel; 820 event TeleportCancel OnTeleportCancel;
820 event DeRezObject OnDeRezObject; 821 event DeRezObject OnDeRezObject;
822 event RezRestoreToWorld OnRezRestoreToWorld;
821 event Action<IClientAPI> OnRegionHandShakeReply; 823 event Action<IClientAPI> OnRegionHandShakeReply;
822 event GenericCall1 OnRequestWearables; 824 event GenericCall1 OnRequestWearables;
823 event Action<IClientAPI, bool> OnCompleteMovementToRegion; 825 event Action<IClientAPI, bool> OnCompleteMovementToRegion;