diff options
author | Tom Grimshaw | 2010-05-10 05:44:24 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-10 05:44:24 -0700 |
commit | 2e94c757296973e07529ad6ae927d9d9251627b6 (patch) | |
tree | 5fb348ddf750087898a6fcdfe0a492c305b35d3b /bin | |
parent | Greatly improve login time for users with large friends lists by requesting a... (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.zip opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.gz opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.bz2 opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.ini.example | 1 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 502a8e6..f1b9126 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -40,6 +40,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
40 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 40 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
41 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 41 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
42 | AssetLoaderArgs = "assets/AssetSets.xml" | 42 | AssetLoaderArgs = "assets/AssetSets.xml" |
43 | AllowRemoteDelete = "false" | ||
43 | 44 | ||
44 | ; * This configuration loads the inventory server modules. It duplicates | 45 | ; * This configuration loads the inventory server modules. It duplicates |
45 | ; * the function of the legacy inventory server | 46 | ; * the function of the legacy inventory server |
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" |