diff options
author | Melanie | 2010-05-06 16:08:24 +0100 |
---|---|---|
committer | Melanie | 2010-05-06 16:08:24 +0100 |
commit | 533bd1bd9b25f6c754493beb11e38777570db728 (patch) | |
tree | 96680eacb7bb1eb224536f12cb624a3a7f453839 /bin | |
parent | Ensure the show in search flag is cleared on ownership change. Also, when (diff) | |
parent | * Fixes Library bugs in grid mode. Partly a missing check and partly a missin... (diff) | |
download | opensim-SC-533bd1bd9b25f6c754493beb11e38777570db728.zip opensim-SC-533bd1bd9b25f6c754493beb11e38777570db728.tar.gz opensim-SC-533bd1bd9b25f6c754493beb11e38777570db728.tar.bz2 opensim-SC-533bd1bd9b25f6c754493beb11e38777570db728.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
-rw-r--r-- | bin/Robust.ini.example | 2 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 489b66f..d8145af 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -125,6 +125,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
125 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 125 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
126 | 126 | ||
127 | WelcomeMessage = "Welcome, Avatar!" | 127 | WelcomeMessage = "Welcome, Avatar!" |
128 | AllowRemoteSetLoginLevel = "false" | ||
129 | |||
128 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) | 130 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) |
129 | ; CHANGE THIS | 131 | ; CHANGE THIS |
130 | HomeURI = "http://127.0.0.1:8002" | 132 | HomeURI = "http://127.0.0.1:8002" |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 2679523..ae3a53c 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -126,7 +126,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
126 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 126 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
127 | 127 | ||
128 | WelcomeMessage = "Welcome, Avatar!" | 128 | WelcomeMessage = "Welcome, Avatar!" |
129 | AllowRemoteSetLoginLevel = "false"; | 129 | AllowRemoteSetLoginLevel = "false" |
130 | 130 | ||
131 | 131 | ||
132 | [GridInfoService] | 132 | [GridInfoService] |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 051a87e..1e24f88 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -40,5 +40,10 @@ | |||
40 | 40 | ||
41 | AllowHypergridMapSearch = true | 41 | AllowHypergridMapSearch = true |
42 | 42 | ||
43 | [LibraryService] | ||
44 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | ||
45 | LibraryName = "OpenSim Library" | ||
46 | DefaultLibrary = "./inventory/Libraries.xml" | ||
47 | |||
43 | [Friends] | 48 | [Friends] |
44 | Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" | 49 | Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" |