aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2009-10-15 21:16:05 +0100
committerMelanie2009-10-15 21:16:05 +0100
commit642084c2a94523fa1dbe00e8c787d4da549881ca (patch)
tree8af3f8bbbd01ddfbc22980291ada1cf896ddf948 /bin
parentMerge branch 'master' into vehicles (diff)
parentminor: Change commented out authentication service realm setting to "users" t... (diff)
downloadopensim-SC-642084c2a94523fa1dbe00e8c787d4da549881ca.zip
opensim-SC-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.gz
opensim-SC-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.bz2
opensim-SC-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Server.ini.example10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 635ba1e..f3d222f 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -58,7 +58,7 @@ LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
58AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 58AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
59StorageProvider = "OpenSim.Data.MySQL.dll" 59StorageProvider = "OpenSim.Data.MySQL.dll"
60ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 60ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
61; Realm = "auth" 61; Realm = "users"
62 62
63; * This is the new style user service. 63; * This is the new style user service.
64; * "Realm" is the table that is used for user lookup. 64; * "Realm" is the table that is used for user lookup.
@@ -75,7 +75,7 @@ ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=gr
75; * It defaults to "regions", which uses the legacy tables 75; * It defaults to "regions", which uses the legacy tables
76; * 76; *
77[GridService] 77[GridService]
78 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 78LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
79 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 79StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
80 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;" 80ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
81 Realm = "regions" 81Realm = "regions"