diff options
author | MW | 2007-08-22 14:37:54 +0000 |
---|---|---|
committer | MW | 2007-08-22 14:37:54 +0000 |
commit | b5921e2b95305d2918f94f52a560f8c004b8bcb4 (patch) | |
tree | 7deec09890e710941ec1a9d9a9f258f5ae8d1c26 /OpenSim/Region/ClientStack | |
parent | Fix for un-encrypted master avatar password in user database (diff) | |
download | opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.zip opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.tar.gz opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.tar.bz2 opensim-SC-b5921e2b95305d2918f94f52a560f8c004b8bcb4.tar.xz |
Start of Task Inventory (ie prim's inventory). For now, you can only move scripts into a prim (from your user inventory) and although the script will now show up in the prims inventory, you can't make any changes to it (or delete it). Also a prim's inventory is currently not saved between restarts.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index cee18fe..029b948 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -91,6 +91,7 @@ namespace OpenSim.Region.ClientStack | |||
91 | public event UDPAssetUploadRequest OnAssetUploadRequest; | 91 | public event UDPAssetUploadRequest OnAssetUploadRequest; |
92 | public event XferReceive OnXferReceive; | 92 | public event XferReceive OnXferReceive; |
93 | public event RequestXfer OnRequestXfer; | 93 | public event RequestXfer OnRequestXfer; |
94 | public event ConfirmXfer OnConfirmXfer; | ||
94 | public event RezScript OnRezScript; | 95 | public event RezScript OnRezScript; |
95 | 96 | ||
96 | public event UUIDNameRequest OnNameFromUUIDRequest; | 97 | public event UUIDNameRequest OnNameFromUUIDRequest; |
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 579b824..c17f453 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -383,6 +383,13 @@ namespace OpenSim.Region.ClientStack | |||
383 | OnXferReceive(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data); | 383 | OnXferReceive(this, xferRec.XferID.ID, xferRec.XferID.Packet, xferRec.DataPacket.Data); |
384 | } | 384 | } |
385 | break; | 385 | break; |
386 | case PacketType.ConfirmXferPacket: | ||
387 | ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack; | ||
388 | if (OnConfirmXfer != null) | ||
389 | { | ||
390 | OnConfirmXfer(this, confirmXfer.XferID.ID, confirmXfer.XferID.Packet); | ||
391 | } | ||
392 | break; | ||
386 | case PacketType.CreateInventoryFolder: | 393 | case PacketType.CreateInventoryFolder: |
387 | if (this.OnCreateNewInventoryFolder != null) | 394 | if (this.OnCreateNewInventoryFolder != null) |
388 | { | 395 | { |