aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-26 20:31:01 +0000
committerJustin Clarke Casey2008-04-26 20:31:01 +0000
commitaccd89b3f1c7729e6bb34b52e8095baf9c1f440a (patch)
treeeb2b485edb92d5349463ec3626f76e005905bdba /OpenSim/Region/ClientStack/ClientView.cs
parent* Ooops, attachments now teleport/cross region borders along with your avatar... (diff)
downloadopensim-SC-accd89b3f1c7729e6bb34b52e8095baf9c1f440a.zip
opensim-SC-accd89b3f1c7729e6bb34b52e8095baf9c1f440a.tar.gz
opensim-SC-accd89b3f1c7729e6bb34b52e8095baf9c1f440a.tar.bz2
opensim-SC-accd89b3f1c7729e6bb34b52e8095baf9c1f440a.tar.xz
* First draft implementation of copying prim inventory items back to agent inventory
* Now, if you own an item in a prim, you should be able to successfully drag it back into your inventory * Temporarily, users which are not owners of the item cannot copy it, even if 'everyone can copy' is set * This is pending fixes/implementation of upstream permission implementation
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs24
1 files changed, 23 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index db0b2cd..35b248a 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -196,6 +196,7 @@ namespace OpenSim.Region.ClientStack
196 private RemoveInventoryFolder handlerRemoveInventoryFolder = null; 196 private RemoveInventoryFolder handlerRemoveInventoryFolder = null;
197 private RequestTaskInventory handlerRequestTaskInventory = null; //OnRequestTaskInventory; 197 private RequestTaskInventory handlerRequestTaskInventory = null; //OnRequestTaskInventory;
198 private UpdateTaskInventory handlerUpdateTaskInventory = null; //OnUpdateTaskInventory; 198 private UpdateTaskInventory handlerUpdateTaskInventory = null; //OnUpdateTaskInventory;
199 private MoveTaskInventory handlerMoveTaskItem = null;
199 private RemoveTaskInventory handlerRemoveTaskItem = null; //OnRemoveTaskItem; 200 private RemoveTaskInventory handlerRemoveTaskItem = null; //OnRemoveTaskItem;
200 private RezScript handlerRezScript = null; //OnRezScript; 201 private RezScript handlerRezScript = null; //OnRezScript;
201 private RequestMapBlocks handlerRequestMapBlocks = null; //OnRequestMapBlocks; 202 private RequestMapBlocks handlerRequestMapBlocks = null; //OnRequestMapBlocks;
@@ -762,6 +763,7 @@ namespace OpenSim.Region.ClientStack
762 public event ConfirmXfer OnConfirmXfer; 763 public event ConfirmXfer OnConfirmXfer;
763 public event RezScript OnRezScript; 764 public event RezScript OnRezScript;
764 public event UpdateTaskInventory OnUpdateTaskInventory; 765 public event UpdateTaskInventory OnUpdateTaskInventory;
766 public event MoveTaskInventory OnMoveTaskItem;
765 public event RemoveTaskInventory OnRemoveTaskItem; 767 public event RemoveTaskInventory OnRemoveTaskItem;
766 public event RequestAsset OnRequestAsset; 768 public event RequestAsset OnRequestAsset;
767 769
@@ -4250,8 +4252,11 @@ namespace OpenSim.Region.ClientStack
4250 } 4252 }
4251 } 4253 }
4252 } 4254 }
4255
4253 break; 4256 break;
4257
4254 case PacketType.RemoveTaskInventory: 4258 case PacketType.RemoveTaskInventory:
4259
4255 RemoveTaskInventoryPacket removeTask = (RemoveTaskInventoryPacket)Pack; 4260 RemoveTaskInventoryPacket removeTask = (RemoveTaskInventoryPacket)Pack;
4256 4261
4257 handlerRemoveTaskItem = OnRemoveTaskItem; 4262 handlerRemoveTaskItem = OnRemoveTaskItem;
@@ -4260,11 +4265,27 @@ namespace OpenSim.Region.ClientStack
4260 { 4265 {
4261 handlerRemoveTaskItem(this, removeTask.InventoryData.ItemID, removeTask.InventoryData.LocalID); 4266 handlerRemoveTaskItem(this, removeTask.InventoryData.ItemID, removeTask.InventoryData.LocalID);
4262 } 4267 }
4268
4263 break; 4269 break;
4270
4264 case PacketType.MoveTaskInventory: 4271 case PacketType.MoveTaskInventory:
4265 m_log.Warn("[CLIENT]: unhandled MoveTaskInventory packet"); 4272
4273 MoveTaskInventoryPacket moveTaskInventoryPacket = (MoveTaskInventoryPacket)Pack;
4274
4275 handlerMoveTaskItem = OnMoveTaskItem;
4276
4277 if (handlerMoveTaskItem != null)
4278 {
4279 handlerMoveTaskItem(
4280 this, moveTaskInventoryPacket.AgentData.FolderID,
4281 moveTaskInventoryPacket.InventoryData.LocalID,
4282 moveTaskInventoryPacket.InventoryData.ItemID);
4283 }
4284
4266 break; 4285 break;
4286
4267 case PacketType.RezScript: 4287 case PacketType.RezScript:
4288
4268 //Console.WriteLine(Pack.ToString()); 4289 //Console.WriteLine(Pack.ToString());
4269 RezScriptPacket rezScriptx = (RezScriptPacket)Pack; 4290 RezScriptPacket rezScriptx = (RezScriptPacket)Pack;
4270 4291
@@ -4275,6 +4296,7 @@ namespace OpenSim.Region.ClientStack
4275 handlerRezScript(this, rezScriptx.InventoryBlock.ItemID, rezScriptx.UpdateBlock.ObjectLocalID); 4296 handlerRezScript(this, rezScriptx.InventoryBlock.ItemID, rezScriptx.UpdateBlock.ObjectLocalID);
4276 } 4297 }
4277 break; 4298 break;
4299
4278 case PacketType.MapLayerRequest: 4300 case PacketType.MapLayerRequest:
4279 RequestMapLayer(); 4301 RequestMapLayer();
4280 break; 4302 break;