From 38e937f91b08a2e52c47d2353c57556f542a00c1 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 28 May 2019 21:37:59 +0100
Subject: add sim feature AvatarHoverHeightEnabled; mantis 8535: make option
 MeshModelAllowTextureToInventory  visible

---
 bin/OpenSimDefaults.ini | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 456dcd6..1332ce8 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1712,17 +1712,12 @@
 [Economy]
     ; the economy module in use
     ; default is the provided BetaGridLikeMoneyModule
-    ; - This module is for demonstration only -
     ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
     ; There is no intention to implement anything further in core OpenSimulator.
     ; This functionality has to be provided by third party modules.
-    ; To use other modules you need to override this setting on OpenSim.ini Economy (or startup) section
     ; economymodule = BetaGridLikeMoneyModule
 
-    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
-    ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
-    ; There is no intention to implement anything further in core OpenSimulator.
-    ; This functionality has to be provided by third party modules.
+    ; Economy values get used in the BetaGridLikeMoneyModule.
 
     ;; Enables selling things for $0.  Default is true.
     ; SellEnabled = true
@@ -1750,6 +1745,14 @@
     ;PriceObjectRent = 0
     ;PriceObjectScaleFactor = 10
     ;PriceParcelRent = 0
+	
+	; Mesh upload settings, independent of economymodule
+	
+	; Create inventory entries for textures uploaded with a model
+	; default is false, ie, do not create
+	; MeshModelAllowTextureToInventory = true
+	
+
 
 [XEngine]
     ; Enable this engine in this OpenSim instance
-- 
cgit v1.1