Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

1 files changed, 8 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a456f4d..245f087 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -515,6 +515,7 @@
         ; so it is disabled by default.
     Cap_WebFetchInventoryDescendents = ""
 
+
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -528,6 +529,7 @@
     ; Distance in meters that shouts should travel.  Default is 100m
     shout_distance = 100
 
+
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
     ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
@@ -554,6 +556,12 @@
     CoalesceMultipleObjectsToInventory = true
 
 
+[Attachments]
+    ; Controls whether avatar attachments are enabled.
+    ; Defaults to true - only set to false for debugging purposes
+    Enabled = true
+
+
 [Mesh]
     ; enable / disable Collada mesh support
     ; default is true