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

4 files changed, 8 insertions, 5 deletions

diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index f1f5ed6..97aaba4 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 31f1064..e19a47a 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -57,11 +57,6 @@
       <appender-ref ref="LogFileAppender" />
     </root>
 
-    <!-- Independently control logging level for XEngine -->
-    <logger name="OpenSim.Region.ScriptEngine.XEngine">
-      <level value="INFO"/>
-    </logger>
-
     <!-- Independently control logging level for per region module loading -->
     <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
       <level value="INFO"/>
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 9a6371b..4d4ebde 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -208,6 +208,10 @@
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
+    ; Will calls to purge folders (empty trash) and immediately delete/update items or folders (not move to trash first) succeed?
+    ; If this is set to false then some other arrangement must be made to perform these operations if necessary.
+    AllowDelete = true
+
 
 ; * This is the new style grid service.
 ; * "Realm" is the table that is used for user lookup.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 0ce16ba..a7b39a3 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -179,6 +179,10 @@
 [InventoryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
+    ; Will calls to purge folders (empty trash) and immediately delete/update items or folders (not move to trash first) succeed?
+    ; If this is set to false then some other arrangement must be made to perform these operations if necessary.
+    AllowDelete = true
+
 
 ; * This is the new style grid service.
 ; * "Realm" is the table that is used for user lookup.