aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2010-05-09 17:04:23 +0100
committerMelanie2010-05-09 17:04:23 +0100
commit4e0d62547d2760ce48cf64373917dcfb893da543 (patch)
tree9f84ddc57b58ed107cd6d610aaeb62039d483a71 /bin/config-include
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentAdd a field asset_flags and a corresponding enum to the asset database. This (diff)
downloadopensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.zip
opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.gz
opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.bz2
opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--bin/config-include/StandaloneHypergrid.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 130e210..32b240b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,9 @@
77 GridService = "OpenSim.Services.GridService.dll:GridService" 77 GridService = "OpenSim.Services.GridService.dll:GridService"
78 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 78 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
79 79
80[GridUserService]
81 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
82
80[FriendsService] 83[FriendsService]
81 LocalServiceModule = "OpenSim.Services.FriendsService.dll" 84 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
82 ConnectionString = "URI=file:friends.db,version=3" 85 ConnectionString = "URI=file:friends.db,version=3"