diff options
author | Mic Bowman | 2011-04-21 08:23:01 -0700 |
---|---|---|
committer | Mic Bowman | 2011-04-21 08:23:01 -0700 |
commit | 371576d1dd9fb49f9e366b0fac44ab73381b3baa (patch) | |
tree | af61ce33dc45340ea1f99066eee64950014994ee /bin/config-include/StandaloneCommon.ini.example | |
parent | Added ability to remove unacked packet from UnackedPacketCollection without a... (diff) | |
parent | fix meshing failure on sculpt maps smaller than 64x64 (diff) | |
download | opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.zip opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.gz opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.bz2 opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.xz |
Merge branch 'master' into queuetest
Diffstat (limited to 'bin/config-include/StandaloneCommon.ini.example')
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index d6f15bb..dcebd63 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -28,10 +28,10 @@ | |||
28 | 28 | ||
29 | [HGInventoryAccessModule] | 29 | [HGInventoryAccessModule] |
30 | ProfileServerURI = "http://127.0.0.1:9000/profiles" | 30 | ProfileServerURI = "http://127.0.0.1:9000/profiles" |
31 | ;; If you want to protect your assets from being copied by foreign visitors | ||
32 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
33 | ; OutboundPermission = False | ||
34 | 31 | ||
32 | ;; If you want to protect your assets from being copied by foreign visitors | ||
33 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
34 | ; OutboundPermission = False | ||
35 | 35 | ||
36 | [Modules] | 36 | [Modules] |
37 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 37 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |
@@ -45,16 +45,9 @@ | |||
45 | AssetCaching = "CenomeMemoryAssetCache" | 45 | AssetCaching = "CenomeMemoryAssetCache" |
46 | Include-CenomeCache = "config-include/CenomeCache.ini" | 46 | Include-CenomeCache = "config-include/CenomeCache.ini" |
47 | 47 | ||
48 | ;; Enable this to use Freeswitch on a standalone | ||
49 | ;FreeswitchServiceInConnector = True | ||
50 | |||
51 | ;; Authorization is not on by default, as it depends on external php | 48 | ;; Authorization is not on by default, as it depends on external php |
52 | ;AuthorizationServices = "LocalAuthorizationServicesConnector" | 49 | ;AuthorizationServices = "LocalAuthorizationServicesConnector" |
53 | 50 | ||
54 | [FreeswitchService] | ||
55 | ;; Configuration for the freeswitch service goes here | ||
56 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | ||
57 | |||
58 | [GridService] | 51 | [GridService] |
59 | ;; For in-memory region storage (default) | 52 | ;; For in-memory region storage (default) |
60 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 53 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
@@ -74,9 +67,8 @@ | |||
74 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 67 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
75 | 68 | ||
76 | ; === HG ONLY === | 69 | ; === HG ONLY === |
77 | ;; change this to the address of your simulator | 70 | ;; change this to the address of your simulator |
78 | Gatekeeper="http://127.0.0.1:9000" | 71 | Gatekeeper="http://127.0.0.1:9000" |
79 | |||
80 | 72 | ||
81 | [LibraryModule] | 73 | [LibraryModule] |
82 | ; Set this if you want to change the name of the OpenSim Library | 74 | ; Set this if you want to change the name of the OpenSim Library |