aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.Server.ini.example
diff options
context:
space:
mode:
authorMelanie2010-01-16 00:05:08 +0000
committerMelanie2010-01-16 00:05:08 +0000
commit10f8c2ea9b67158c32b361f9652d503ea48de292 (patch)
treebe0d88bc4b6df3825a0d27f62a08170d7c7ad262 /bin/OpenSim.Server.ini.example
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
parentAdd "create user" instructions to README.txt (diff)
downloadopensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.zip
opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz
opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2
opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'bin/OpenSim.Server.ini.example')
-rw-r--r--bin/OpenSim.Server.ini.example7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index b13e739..3d2a5ba 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -23,6 +23,7 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
23; * Leave commented to diable logins to the console 23; * Leave commented to diable logins to the console
24;ConsoleUser = Test 24;ConsoleUser = Test
25;ConsolePass = secret 25;ConsolePass = secret
26;ConsolePort = 0
26 27
27; * As an example, the below configuration precisely mimicks the legacy 28; * As an example, the below configuration precisely mimicks the legacy
28; * asset server. It is read by the asset IN connector (defined above) 29; * asset server. It is read by the asset IN connector (defined above)
@@ -55,11 +56,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
55 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 56 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
56 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 57 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
57 Realm = "regions" 58 Realm = "regions"
59 ; AllowDuplicateNames = "True"
58 ;; Next, we can specify properties of regions, including default and fallback regions 60 ;; Next, we can specify properties of regions, including default and fallback regions
59 ;; The syntax is: Region_<RegioName> = "<flags>" 61 ;; The syntax is: Region_<RegioName> = "<flags>"
60 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut 62 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
61 ;; For example: 63 ;; For example:
62 Region_Welcome_Area = "DefaultRegion, FallbackRegion" 64 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
63 65
64; * This is the configuration for the freeswitch server in grid mode 66; * This is the configuration for the freeswitch server in grid mode
65[FreeswitchService] 67[FreeswitchService]
@@ -99,7 +101,6 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
99 GridService = "OpenSim.Services.GridService.dll:GridService" 101 GridService = "OpenSim.Services.GridService.dll:GridService"
100 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 102 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
101 103
102
103[PresenceService] 104[PresenceService]
104 ; for the server connector 105 ; for the server connector
105 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 106 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"