aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Robust.ini.example
diff options
context:
space:
mode:
authorMelanie2010-12-12 01:20:46 +0000
committerMelanie2010-12-12 01:20:46 +0000
commit8aa63093b118f257eff87c003e668249c34f5162 (patch)
treea5ea5448482d899729c29079ed0dab8394bb9be4 /bin/Robust.ini.example
parentFix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff)
parentRevert "Another stab at mantis #5256" (diff)
downloadopensim-SC-8aa63093b118f257eff87c003e668249c34f5162.zip
opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.tar.gz
opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2
opensim-SC-8aa63093b118f257eff87c003e668249c34f5162.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/Robust.ini.example')
-rw-r--r--bin/Robust.ini.example10
1 files changed, 4 insertions, 6 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index b12e05b..7c13076 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -16,7 +16,7 @@
16ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" 16ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
17 17
18; * This is common for all services, it's the network setup for the entire 18; * This is common for all services, it's the network setup for the entire
19; * server instance, if none if specified above 19; * server instance, if none is specified above
20; * 20; *
21[Network] 21[Network]
22 port = 8003 22 port = 8003
@@ -40,7 +40,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
40[AssetService] 40[AssetService]
41 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 41 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
42 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 42 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
43 AssetLoaderArgs = "assets/AssetSets.xml" 43 AssetLoaderArgs = "./assets/AssetSets.xml"
44 AllowRemoteDelete = "false" 44 AllowRemoteDelete = "false"
45 45
46; * This configuration loads the inventory server modules. It duplicates 46; * This configuration loads the inventory server modules. It duplicates
@@ -84,9 +84,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
84 ; Password = "password" 84 ; Password = "password"
85 85
86; * This is the new style authentication service. Currently, only MySQL 86; * This is the new style authentication service. Currently, only MySQL
87; * is implemented. "Realm" is the table that is used for user lookup. 87; * is implemented.
88; * It defaults to "users", which uses the legacy tables as an
89; * authentication source.
90; * 88; *
91[AuthenticationService] 89[AuthenticationService]
92 ; for the server connector 90 ; for the server connector
@@ -158,7 +156,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
158 ; MapTileURL = ""; 156 ; MapTileURL = "";
159 157
160 ; If you run this login server behind a proxy, set this to true 158 ; If you run this login server behind a proxy, set this to true
161 ; HasProxy = true 159 ; HasProxy = false
162 160
163[GridInfoService] 161[GridInfoService]
164 ; These settings are used to return information on a get_grid_info call. 162 ; These settings are used to return information on a get_grid_info call.