make the setting economymodule visible on Economy section of OpenSimDefaults.ini and OpenSim.ini.example. This setting must be changed to allow other modules and disable our simple one. (ours does look for it at Startup section for legacy reasons)

2 files changed, 32 insertions, 20 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 14a41b0..21f9841 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -864,6 +864,10 @@
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 [Economy]
+    ; the economy module in use
+    ; To use other modules you need to override this setting
+    ; economymodule = BetaGridLikeMoneyModule
+    
     ;# {SellEnabled} {} {Enable selling for 0?} {true false} true
     ; 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.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index bb81c95..d76565a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1709,40 +1709,48 @@
     ; data service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
-
+    
 [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.
 
     ;; Enables selling things for $0.  Default is true.
-    SellEnabled = true
+    ; SellEnabled = true
 
     ;; Money Unit fee to upload textures, animations etc.  Default is 0.
-    PriceUpload = 0 
+    ;PriceUpload = 0 
 
     ;; Money Unit fee to create groups.  Default is 0.
-    PriceGroupCreate = 0 
+    ;PriceGroupCreate = 0 
 
     ; We don't really know what the rest of these values do.  These get sent to the client
     ; These taken from Agni at a Public Telehub.  Change at your own risk.
-    ObjectCount = 0
-    PriceEnergyUnit = 100
-    PriceObjectClaim = 10
-    PricePublicObjectDecay = 4
-    PricePublicObjectDelete = 4
-    PriceParcelClaim = 1
-    PriceParcelClaimFactor = 1
-
-    PriceRentLight = 5
-    TeleportMinPrice = 2
-    TeleportPriceExponent = 2
-    EnergyEfficiency = 1
-    PriceObjectRent = 1
-    PriceObjectScaleFactor = 10
-    PriceParcelRent = 1
-
+    ;ObjectCount = 0
+    ;PriceEnergyUnit = 0
+    ;PriceObjectClaim = 0
+    ;PricePublicObjectDecay = 0
+    ;PricePublicObjectDelete = 0
+    ;PriceParcelClaim = 0
+    ;PriceParcelClaimFactor = 1
+
+    ;PriceRentLight = 0
+    ;TeleportMinPrice = 0
+    ;TeleportPriceExponent = 2
+    ;EnergyEfficiency = 1
+    ;PriceObjectRent = 0
+    ;PriceObjectScaleFactor = 10
+    ;PriceParcelRent = 0
 
 [XEngine]
     ; Enable this engine in this OpenSim instance