aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include/StandaloneCommon.ini.example
diff options
context:
space:
mode:
authorMic Bowman2011-08-19 14:49:16 -0700
committerMic Bowman2011-08-19 14:49:16 -0700
commit384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch)
tree5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /bin/config-include/StandaloneCommon.ini.example
parentBulletSim: add runtime setting of physics parameters. Update default values. (diff)
parentGet rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff)
downloadopensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz
Merge branch 'master' into bulletsim
Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r--bin/config-include/StandaloneCommon.ini.example13
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ee0523f..431dce1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -45,14 +45,15 @@
45[Modules] 45[Modules]
46 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 46 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
47 ;; Copy the config .example file into your own .ini file and change configs there 47 ;; Copy the config .example file into your own .ini file and change configs there
48 ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
48 49
49 ;AssetCaching = "GlynnTuckerAssetCache" 50 AssetCaching = "FlotsamAssetCache"
51 Include-FlotsamCache = "config-include/FlotsamCache.ini"
50 52
51 ;AssetCaching = "FlotsamAssetCache" 53 ;AssetCaching = "GlynnTuckerAssetCache"
52 ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
53 54
54 AssetCaching = "CenomeMemoryAssetCache" 55 ; AssetCaching = "CenomeMemoryAssetCache"
55 Include-CenomeCache = "config-include/CenomeCache.ini" 56 ; Include-CenomeCache = "config-include/CenomeCache.ini"
56 57
57 ;; Authorization is not on by default, as it depends on external php 58 ;; Authorization is not on by default, as it depends on external php
58 ;AuthorizationServices = "LocalAuthorizationServicesConnector" 59 ;AuthorizationServices = "LocalAuthorizationServicesConnector"
@@ -99,6 +100,8 @@
99 ;; For Viewer 2 100 ;; For Viewer 2
100 MapTileURL = "http://127.0.0.1:9000/" 101 MapTileURL = "http://127.0.0.1:9000/"
101 102
103 ;Currency = ""
104
102 ;; Regular expressions for controlling which client versions are accepted/denied. 105 ;; Regular expressions for controlling which client versions are accepted/denied.
103 ;; An empty string means nothing is checked. 106 ;; An empty string means nothing is checked.
104 ;; 107 ;;