diff options
| author | Melanie | 2009-08-22 20:18:56 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-22 20:18:56 +0100 |
| commit | 1e4238af92dbfdc12be08c211cd0b9d813bfb268 (patch) | |
| tree | 812c0fcb2f7797098d9d3c5855c1ed93e603be76 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |
| parent | Change prompt handling in console. No user changes (diff) | |
| parent | Moved a debug message. (diff) | |
| download | opensim-SC-1e4238af92dbfdc12be08c211cd0b9d813bfb268.zip opensim-SC-1e4238af92dbfdc12be08c211cd0b9d813bfb268.tar.gz opensim-SC-1e4238af92dbfdc12be08c211cd0b9d813bfb268.tar.bz2 opensim-SC-1e4238af92dbfdc12be08c211cd0b9d813bfb268.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 2b815a2..d3e414f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
| @@ -552,7 +552,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 552 | 552 | ||
| 553 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) | 553 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) |
| 554 | { | 554 | { |
| 555 | InventoryFolderBase folder = new InventoryFolderBase(folderID); | 555 | InventoryFolderBase folder = new InventoryFolderBase(folderID, remoteClient.AgentId); |
| 556 | folder = InventoryService.GetFolder(folder); | 556 | folder = InventoryService.GetFolder(folder); |
| 557 | if (folder != null) | 557 | if (folder != null) |
| 558 | { | 558 | { |