aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-02-26 08:46:30 -0800
committerDiva Canto2010-02-26 08:46:30 -0800
commitcc05bdf6aba5d74202cb5863a5d0f5950540e7bd (patch)
treedd6275ae206f9216bc027efcad48f0f88435f1d5 /bin
parentAdded server-side Friends in connector. Untested. (diff)
downloadopensim-SC_OLD-cc05bdf6aba5d74202cb5863a5d0f5950540e7bd.zip
opensim-SC_OLD-cc05bdf6aba5d74202cb5863a5d0f5950540e7bd.tar.gz
opensim-SC_OLD-cc05bdf6aba5d74202cb5863a5d0f5950540e7bd.tar.bz2
opensim-SC_OLD-cc05bdf6aba5d74202cb5863a5d0f5950540e7bd.tar.xz
* Friends out connector completed. Grid login retrieves friends correctly.
* Added friends configs to grid .inis
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.Server.HG.ini.example6
-rw-r--r--bin/OpenSim.Server.ini.example6
-rw-r--r--bin/config-include/Grid.ini2
-rw-r--r--bin/config-include/GridCommon.ini.example7
-rw-r--r--bin/config-include/GridHypergrid.ini2
5 files changed, 19 insertions, 4 deletions
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example
index 732d123..97c2e06 100644
--- a/bin/OpenSim.Server.HG.ini.example
+++ b/bin/OpenSim.Server.HG.ini.example
@@ -11,7 +11,7 @@
11;; 11;;
12 12
13[Startup] 13[Startup]
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" 14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
15 15
16; * This is common for all services, it's the network setup for the entire 16; * This is common for all services, it's the network setup for the entire
17; * server instance, if none if specified above 17; * server instance, if none if specified above
@@ -102,6 +102,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
102 ; for the server connector 102 ; for the server connector
103 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 103 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
104 104
105[FriendsService]
106 ; for the server connector
107 LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
108
105[LibraryService] 109[LibraryService]
106 LibraryName = "OpenSim Library" 110 LibraryName = "OpenSim Library"
107 DefaultLibrary = "./inventory/Libraries.xml" 111 DefaultLibrary = "./inventory/Libraries.xml"
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index e6508b1..e822e83 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -11,7 +11,7 @@
11; * 11; *
12[Startup] 12[Startup]
13 13
14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,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" 14ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,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:FriendsServiceConnector"
15 15
16; * This is common for all services, it's the network setup for the entire 16; * This is common for all services, it's the network setup for the entire
17; * server instance, if none if specified above 17; * server instance, if none if specified above
@@ -104,6 +104,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
104 ; for the server connector 104 ; for the server connector
105 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 105 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
106 106
107[FriendsService]
108 ; for the server connector
109 LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
110
107[LibraryService] 111[LibraryService]
108 LibraryName = "OpenSim Library" 112 LibraryName = "OpenSim Library"
109 DefaultLibrary = "./inventory/Libraries.xml" 113 DefaultLibrary = "./inventory/Libraries.xml"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index a656e7b..9dff325 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -36,4 +36,4 @@
36 DefaultLibrary = "./inventory/Libraries.xml" 36 DefaultLibrary = "./inventory/Libraries.xml"
37 37
38[Friends] 38[Friends]
39 Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector" 39 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index a62868e..4717561 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -46,6 +46,13 @@
46 ; 46 ;
47 AuthenticationServerURI = "http://mygridserver.com:8003" 47 AuthenticationServerURI = "http://mygridserver.com:8003"
48 48
49[FriendsService]
50 ;
51 ; change this to your grid-wide friends server
52 ;
53 FriendsServerURI = "http://mygridserver.com:8003"
54
55
49[Modules] 56[Modules]
50 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 57 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
51 ;; Copy the config .example file into your own .ini file and change configs there 58 ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 36cefdc..b567817 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -42,4 +42,4 @@
42 AllowHypergridMapSearch = true 42 AllowHypergridMapSearch = true
43 43
44[Friends] 44[Friends]
45 Connector = "OpenSim.Services.Connectors.dll:FriendsServiceConnector" 45 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"