aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-16 10:09:19 -0700
committerJohn Hurliman2009-10-16 10:09:19 -0700
commit06354a093d926e87236c5840e84f5ef9d518c1e0 (patch)
treeea9f00b5a4e979eb284cf941d0dfa3ceff648b4f /bin
parentObject update prioritization by Jim Greensky of Intel Labs, part one. This im... (diff)
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-06354a093d926e87236c5840e84f5ef9d518c1e0.zip
opensim-SC_OLD-06354a093d926e87236c5840e84f5ef9d518c1e0.tar.gz
opensim-SC_OLD-06354a093d926e87236c5840e84f5ef9d518c1e0.tar.bz2
opensim-SC_OLD-06354a093d926e87236c5840e84f5ef9d518c1e0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
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"