Merge branch 'master' into connector_plugin

Conflicts: OpenSim/Server/ServerMain.cs
author: BlueWall 2012-10-09 06:44:14 -0400
committer: BlueWall 2012-10-09 06:44:14 -0400
commit: 252af020b05f386f88174cdd28191e0efbeba626 (patch)
tree: f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /bin/Robust.ini.example
parent: Added parts to manage repositories and plugin management (diff)
parent: Fix build break (diff)
download: opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.zip
opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.tar.gz
opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2
opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.tar.xz
1 files changed, 17 insertions, 1 deletions
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 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-ServiceConnectors = "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"
+[ServiceList]
+AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
+VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
+GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
+GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
+AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
+OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
+AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
+LLLoginServiceInConnector = "8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
+PresenceServiceConnector = "8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
+UserAccountServiceConnector = "8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
+GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
+FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
+MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
+MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
 ; Plugin Registry Location
 ; Set path to directory for plugin registry. Information
author	BlueWall	2012-10-09 06:44:14 -0400
committer	BlueWall	2012-10-09 06:44:14 -0400
commit	252af020b05f386f88174cdd28191e0efbeba626 (patch)
tree	f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /bin/Robust.ini.example
parent	Added parts to manage repositories and plugin management (diff)
parent	Fix build break (diff)
download	opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC-252af020b05f386f88174cdd28191e0efbeba626.tar.xz

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]
16	ServiceConnectors = "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]
		18	AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
		19	InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
		20	VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
		21	GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
		22	GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
		23	AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
		24	OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
		25	AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
		26	LLLoginServiceInConnector = "8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
		27	PresenceServiceConnector = "8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
		28	UserAccountServiceConnector = "8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
		29	GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
		30	FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
		31	MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
		32	MapGetServiceConnector = "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