aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorBlueWall2013-06-13 09:27:13 -0400
committerBlueWall2013-06-13 09:27:13 -0400
commitd7f3d7efd24e5567fcb872460c2922336ce6e398 (patch)
tree3ca4515a5664d25856a972b13e7fac088b23e547 /bin
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentAdd Option: ClassifiedFee (diff)
downloadopensim-SC_OLD-d7f3d7efd24e5567fcb872460c2922336ce6e398.zip
opensim-SC_OLD-d7f3d7efd24e5567fcb872460c2922336ce6e398.tar.gz
opensim-SC_OLD-d7f3d7efd24e5567fcb872460c2922336ce6e398.tar.bz2
opensim-SC_OLD-d7f3d7efd24e5567fcb872460c2922336ce6e398.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/Robust.HG.ini.example3
-rw-r--r--bin/Robust.ini.example3
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
3 files changed, 9 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d9f1ca1..466aed2 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -311,6 +311,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
311 ;; Ask co-operative viewers to use a different currency name 311 ;; Ask co-operative viewers to use a different currency name
312 ;Currency = "" 312 ;Currency = ""
313 313
314 ;; Set minimum fee to publish classified
315 ; ClassifiedFee = 0
316
314 WelcomeMessage = "Welcome, Avatar!" 317 WelcomeMessage = "Welcome, Avatar!"
315 AllowRemoteSetLoginLevel = "false" 318 AllowRemoteSetLoginLevel = "false"
316 319
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7d6492b..da1b43a 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -274,6 +274,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
274 ; Ask co-operative viewers to use a different currency name 274 ; Ask co-operative viewers to use a different currency name
275 ;Currency = "" 275 ;Currency = ""
276 276
277 ;; Set minimum fee to publish classified
278 ; ClassifiedFee = 0
279
277 WelcomeMessage = "Welcome, Avatar!" 280 WelcomeMessage = "Welcome, Avatar!"
278 AllowRemoteSetLoginLevel = "false" 281 AllowRemoteSetLoginLevel = "false"
279 282
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..6b991a8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -115,6 +115,9 @@
115 ;; Ask co-operative viewers to use a different currency name 115 ;; Ask co-operative viewers to use a different currency name
116 ;Currency = "" 116 ;Currency = ""
117 117
118 ;; Set minimum fee to publish classified
119 ; ClassifiedFee = 0
120
118 ;; Regular expressions for controlling which client versions are accepted/denied. 121 ;; Regular expressions for controlling which client versions are accepted/denied.
119 ;; An empty string means nothing is checked. 122 ;; An empty string means nothing is checked.
120 ;; 123 ;;