aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-03-05 20:37:58 +0000
committerUbitUmarov2018-03-05 20:37:58 +0000
commitc5ce9b7be81414ea078477fe89e886bab3777edc (patch)
treea9d875de59c6da58208f7b489d44bc6e1f9c69c8
parentchange SampleMoneyModule intialization, make it look for economymodule settin... (diff)
downloadopensim-SC-c5ce9b7be81414ea078477fe89e886bab3777edc.zip
opensim-SC-c5ce9b7be81414ea078477fe89e886bab3777edc.tar.gz
opensim-SC-c5ce9b7be81414ea078477fe89e886bab3777edc.tar.bz2
opensim-SC-c5ce9b7be81414ea078477fe89e886bab3777edc.tar.xz
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)
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example4
-rw-r--r--bin/OpenSimDefaults.ini48
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 @@
864 ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py" 864 ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
865 865
866[Economy] 866[Economy]
867 ; the economy module in use
868 ; To use other modules you need to override this setting
869 ; economymodule = BetaGridLikeMoneyModule
870
867 ;# {SellEnabled} {} {Enable selling for 0?} {true false} true 871 ;# {SellEnabled} {} {Enable selling for 0?} {true false} true
868 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc). 872 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
869 ; There is no intention to implement anything further in core OpenSimulator. 873 ; 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 @@
1709 ; data service 1709 ; data service
1710 ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py" 1710 ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
1711 1711
1712 1712
1713[Economy] 1713[Economy]
1714 ; the economy module in use
1715 ; default is the provided BetaGridLikeMoneyModule
1716 ; - This module is for demonstration only -
1717 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
1718 ; There is no intention to implement anything further in core OpenSimulator.
1719 ; This functionality has to be provided by third party modules.
1720 ; To use other modules you need to override this setting on OpenSim.ini Economy (or startup) section
1721 ; economymodule = BetaGridLikeMoneyModule
1722
1714 ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - 1723 ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only -
1715 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc). 1724 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
1716 ; There is no intention to implement anything further in core OpenSimulator. 1725 ; There is no intention to implement anything further in core OpenSimulator.
1717 ; This functionality has to be provided by third party modules. 1726 ; This functionality has to be provided by third party modules.
1718 1727
1719 ;; Enables selling things for $0. Default is true. 1728 ;; Enables selling things for $0. Default is true.
1720 SellEnabled = true 1729 ; SellEnabled = true
1721 1730
1722 ;; Money Unit fee to upload textures, animations etc. Default is 0. 1731 ;; Money Unit fee to upload textures, animations etc. Default is 0.
1723 PriceUpload = 0 1732 ;PriceUpload = 0
1724 1733
1725 ;; Money Unit fee to create groups. Default is 0. 1734 ;; Money Unit fee to create groups. Default is 0.
1726 PriceGroupCreate = 0 1735 ;PriceGroupCreate = 0
1727 1736
1728 ; We don't really know what the rest of these values do. These get sent to the client 1737 ; We don't really know what the rest of these values do. These get sent to the client
1729 ; These taken from Agni at a Public Telehub. Change at your own risk. 1738 ; These taken from Agni at a Public Telehub. Change at your own risk.
1730 ObjectCount = 0 1739 ;ObjectCount = 0
1731 PriceEnergyUnit = 100 1740 ;PriceEnergyUnit = 0
1732 PriceObjectClaim = 10 1741 ;PriceObjectClaim = 0
1733 PricePublicObjectDecay = 4 1742 ;PricePublicObjectDecay = 0
1734 PricePublicObjectDelete = 4 1743 ;PricePublicObjectDelete = 0
1735 PriceParcelClaim = 1 1744 ;PriceParcelClaim = 0
1736 PriceParcelClaimFactor = 1 1745 ;PriceParcelClaimFactor = 1
1737 1746
1738 PriceRentLight = 5 1747 ;PriceRentLight = 0
1739 TeleportMinPrice = 2 1748 ;TeleportMinPrice = 0
1740 TeleportPriceExponent = 2 1749 ;TeleportPriceExponent = 2
1741 EnergyEfficiency = 1 1750 ;EnergyEfficiency = 1
1742 PriceObjectRent = 1 1751 ;PriceObjectRent = 0
1743 PriceObjectScaleFactor = 10 1752 ;PriceObjectScaleFactor = 10
1744 PriceParcelRent = 1 1753 ;PriceParcelRent = 0
1745
1746 1754
1747[XEngine] 1755[XEngine]
1748 ; Enable this engine in this OpenSim instance 1756 ; Enable this engine in this OpenSim instance