Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 8 insertions, 2 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
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
                         folder = m_Scene.InventoryService.GetFolder(f);
+
+                        if(folder.Type == 14 || folder.Type == 16)
+                        {
+                            // folder.Type = 6;
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                        }
                     }
                 }
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d74f205..fee2a87 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -35,7 +35,7 @@
   ; Modular configurations
   ; Set path to directory for modular ini files...
   ; The Robust.exe process must have R/W access to the location 
-  ConfigDirectory = "/home/opensim/etc/Configs"
+  ConfigDirectory = "."
 
 [ServiceList]
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index b7b2524..2d5aa8c 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -27,7 +27,7 @@
   ; Modular configurations
   ; Set path to directory for modular ini files...
   ; The Robust.exe process must have R/W access to the location 
-  ConfigDirectory = "/home/opensim/etc/Configs"
+  ConfigDirectory = "."
 
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"