aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-02-28 23:26:38 +0000
committerMelanie2010-02-28 23:26:38 +0000
commit18727235a071507373d93725885daf07b36b524d (patch)
tree26a2b10747801c9fef2482198b2ab6304ea5c39c /bin
parentImplement rights changes locall (UNTESTED) (diff)
parentAdded FriendsData to both Null storage and SQLite. Untested. (diff)
downloadopensim-SC_OLD-18727235a071507373d93725885daf07b36b524d.zip
opensim-SC_OLD-18727235a071507373d93725885daf07b36b524d.tar.gz
opensim-SC_OLD-18727235a071507373d93725885daf07b36b524d.tar.bz2
opensim-SC_OLD-18727235a071507373d93725885daf07b36b524d.tar.xz
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Standalone.ini4
-rw-r--r--bin/config-include/StandaloneHypergrid.ini4
2 files changed, 8 insertions, 0 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ce77b3f..b35f8a5 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -59,6 +59,10 @@
59 GridService = "OpenSim.Services.GridService.dll:GridService" 59 GridService = "OpenSim.Services.GridService.dll:GridService"
60 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 60 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
61 61
62[FriendsService]
63 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
64 ConnectionString = "URI=file:friends.db,version=3"
65
62[Friends] 66[Friends]
63 Connector = "OpenSim.Services.FriendsService.dll" 67 Connector = "OpenSim.Services.FriendsService.dll"
64 68
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ecdd6f7..ee84c81 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -77,6 +77,10 @@
77 GridService = "OpenSim.Services.GridService.dll:GridService" 77 GridService = "OpenSim.Services.GridService.dll:GridService"
78 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" 78 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
79 79
80[FriendsService]
81 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
82 ConnectionString = "URI=file:friends.db,version=3"
83
80[Friends] 84[Friends]
81 Connector = "OpenSim.Services.FriendsService.dll" 85 Connector = "OpenSim.Services.FriendsService.dll"
82 86