diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
index 8f65a69121..b0ba5a3779 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -77,6 +77,9 @@ namespace OpenSim.Region.ClientStack.LindenCaps
             {
                 RegisterCaps(agentID, caps);
             };
+            ISimulatorFeaturesModule simFeatures = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+            if(simFeatures != null)
+                simFeatures.AddFeature("AvatarHoverHeightEnabled",OSD.FromBoolean(true));
         }
 
         public void PostInitialise() {}
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 456dcd6e8a..1332ce81b2 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