aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:10:19 -0800
committerJohn Hurliman2010-02-22 14:10:19 -0800
commit71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch)
treecca5b1ea88ad4b29156767afdd77e37ec072c8a7 /bin
parent* Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff)
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
downloadopensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip
opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz
opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2
opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Server.ini.example14
-rw-r--r--bin/config-include/Standalone.ini14
-rw-r--r--bin/config-include/StandaloneHypergrid.ini14
3 files changed, 16 insertions, 26 deletions
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 0535765..54101b0 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -122,17 +122,3 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
122 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" 122 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
123 123
124 WelcomeMessage = "Welcome, Avatar!" 124 WelcomeMessage = "Welcome, Avatar!"
125
126; * This is the new style grid service.
127; * "Realm" is the table that is used for user lookup.
128; * It defaults to "regions", which uses the legacy tables
129; *
130[GridService]
131LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
132StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
133ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
134Realm = "regions"
135
136; If true, duplicate region names are allowed on the grid. If false, no duplicate names are allowed
137; Default is false
138; AllowDuplicateNames = "True"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bd90df4..06333d8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -4,9 +4,6 @@
4;; which you can copy and change. 4;; which you can copy and change.
5;; 5;;
6 6
7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini"
9
10[Modules] 7[Modules]
11 AssetServices = "LocalAssetServicesConnector" 8 AssetServices = "LocalAssetServicesConnector"
12 InventoryServices = "LocalInventoryServicesConnector" 9 InventoryServices = "LocalInventoryServicesConnector"
@@ -35,14 +32,14 @@
35 32
36[AvatarService] 33[AvatarService]
37 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 34 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
38 StorageProvider = "OpenSim.Data.Null.dll" 35 ConnectionString = "URI=file:avatars.db,version=3"
39 36
40[AuthorizationService] 37[AuthorizationService]
41 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 38 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
42 39
43[AuthenticationService] 40[AuthenticationService]
44 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 41 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
45 StorageProvider = "OpenSim.Data.Null.dll" 42 ConnectionString = "URI=file:auth.db,version=3"
46 43
47[GridService] 44[GridService]
48 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -55,7 +52,7 @@
55 52
56[UserAccountService] 53[UserAccountService]
57 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 54 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
58 StorageProvider = "OpenSim.Data.Null.dll" 55 ConnectionString = "URI=file:userprofiles.db,version=3"
59 ;; These are for creating new accounts 56 ;; These are for creating new accounts
60 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 57 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
61 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 58 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -72,3 +69,8 @@
72 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 69 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
73 70
74 WelcomeMessage = "Welcome, Avatar!" 71 WelcomeMessage = "Welcome, Avatar!"
72
73
74;; This should always be the very last thing on this file
75[Includes]
76 Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a4fa5be..04a2356 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,9 +3,6 @@
3;; All optional settings are in StandaloneCommon.ini.example, 3;; All optional settings are in StandaloneCommon.ini.example,
4;; which you can copy and change. 4;; which you can copy and change.
5;; 5;;
6
7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini"
9 6
10[Modules] 7[Modules]
11 AssetServices = "HGAssetBroker" 8 AssetServices = "HGAssetBroker"
@@ -45,7 +42,7 @@
45 42
46[AvatarService] 43[AvatarService]
47 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 44 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
48 StorageProvider = "OpenSim.Data.Null.dll" 45 ConnectionString = "URI=file:avatars.db,version=3"
49 46
50[LibraryService] 47[LibraryService]
51 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 48 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -57,7 +54,7 @@
57 54
58[AuthenticationService] 55[AuthenticationService]
59 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 56 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
60 StorageProvider = "OpenSim.Data.Null.dll" 57 ConnectionString = "URI=file:auth.db,version=3"
61 58
62[GridService] 59[GridService]
63 ; LocalGridServicesConnector needs this 60 ; LocalGridServicesConnector needs this
@@ -73,7 +70,7 @@
73 70
74[UserAccountService] 71[UserAccountService]
75 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 72 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
76 StorageProvider = "OpenSim.Data.Null.dll" 73 ConnectionString = "URI=file:userprofiles.db,version=3"
77 ;; These are for creating new accounts by the service 74 ;; These are for creating new accounts by the service
78 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 75 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
79 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 76 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -112,3 +109,8 @@
112[HGInventoryService] 109[HGInventoryService]
113 ; For the InventoryServiceInConnector 110 ; For the InventoryServiceInConnector
114 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 111 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
112
113
114;; This should always be the very last thing on this file
115[Includes]
116 Include-Common = "config-include/StandaloneCommon.ini"