aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorBlueWall2012-10-09 06:44:14 -0400
committerBlueWall2012-10-09 06:44:14 -0400
commit252af020b05f386f88174cdd28191e0efbeba626 (patch)
treef425499b4338fa3a15f51b7621f4d37dec1d5ce7 /bin
parentAdded parts to manage repositories and plugin management (diff)
parentFix build break (diff)
downloadopensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip
opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz
opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2
opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz
Merge branch 'master' into connector_plugin
Conflicts: OpenSim/Server/ServerMain.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini4
-rw-r--r--bin/Robust.ini.example18
2 files changed, 21 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6e6a089..677ac74 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -427,6 +427,10 @@
427 ; " (Mozilla Compatible)" to the text where there are problems with a web server 427 ; " (Mozilla Compatible)" to the text where there are problems with a web server
428 ;user_agent = "OpenSim LSL (Mozilla Compatible)" 428 ;user_agent = "OpenSim LSL (Mozilla Compatible)"
429 429
430 ; OpenSim can send multiple simultaneous requests for services such as asset
431 ; retrieval. However, some versions of mono appear to hang when there are too
432 ; many simultaneous requests, default is 30 and is currently applied only to assets
433 ;MaxRequestConcurrency = 30
430 434
431[XMLRPC] 435[XMLRPC]
432 ; ## 436 ; ##
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 430be26..fbe4a51 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -13,7 +13,23 @@
13; * [[<ConfigName>@]<port>/]<dll name>[:<class name>] 13; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
14; * 14; *
15[Startup] 15[Startup]
16ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/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,8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector,8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" 16
17[ServiceList]
18AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
19InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
20VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
21GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
22GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
23AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
24OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
25AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
26LLLoginServiceInConnector = "8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
27PresenceServiceConnector = "8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
28UserAccountServiceConnector = "8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
29GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
30FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
31MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
32MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
17 33
18; Plugin Registry Location 34; Plugin Registry Location
19; Set path to directory for plugin registry. Information 35; Set path to directory for plugin registry. Information