diff options
| author | Justin Clark-Casey (justincc) | 2013-05-03 18:51:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-05-03 18:51:29 +0100 |
| commit | 7ca42d57110b5193d1a64145e3b3a5a2ada715b3 (patch) | |
| tree | 8fb481024e0f045796a3acbd2b5d21990a38673f /OpenSim | |
| parent | On startup, start scenes after we're set up all local scenes, rather than sta... (diff) | |
| parent | Make default config directory "." (diff) | |
| download | opensim-SC_OLD-7ca42d57110b5193d1a64145e3b3a5a2ada715b3.zip opensim-SC_OLD-7ca42d57110b5193d1a64145e3b3a5a2ada715b3.tar.gz opensim-SC_OLD-7ca42d57110b5193d1a64145e3b3a5a2ada715b3.tar.bz2 opensim-SC_OLD-7ca42d57110b5193d1a64145e3b3a5a2ada715b3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index eb37626..e6d6cbf 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -671,6 +671,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 671 | { | 671 | { |
| 672 | InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID); | 672 | InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID); |
| 673 | folder = m_Scene.InventoryService.GetFolder(f); | 673 | folder = m_Scene.InventoryService.GetFolder(f); |
| 674 | |||
| 675 | if(folder.Type == 14 || folder.Type == 16) | ||
| 676 | { | ||
| 677 | // folder.Type = 6; | ||
| 678 | folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object); | ||
| 679 | } | ||
| 674 | } | 680 | } |
| 675 | } | 681 | } |
| 676 | 682 | ||