diff options
| author | Arthur Valadares | 2009-08-25 10:28:22 -0300 |
|---|---|---|
| committer | Arthur Valadares | 2009-08-25 10:28:22 -0300 |
| commit | 9c9fa51b0f005f570df2e3e3b84dfa3974935995 (patch) | |
| tree | 49553fb3d3513f826f360eb426e1be7242a92aaf /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |
| parent | Adds osDrawPolygon to OSSL. Works a little different then other OS Drawing fu... (diff) | |
| parent | Closed the web request and stream in SynchronousRestSessionObjectPoster -- ma... (diff) | |
| download | opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.zip opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.gz opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.bz2 opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
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 | { |