aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-12-27 15:25:08 -0800
committerDiva Canto2010-12-27 15:25:08 -0800
commitf801d50a8a2df43b3b4d99ebf32de603e4cfa226 (patch)
tree10df8284fcae0c4140bde3affb0ed412b4447e05 /bin
parentDrop the static from default wearables. It isn't (diff)
downloadopensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.zip
opensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.tar.gz
opensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.tar.bz2
opensim-SC_OLD-f801d50a8a2df43b3b4d99ebf32de603e4cfa226.tar.xz
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Grid.ini2
-rw-r--r--bin/config-include/GridHypergrid.ini2
-rw-r--r--bin/config-include/HyperSimianGrid.ini5
-rw-r--r--bin/config-include/SimianGrid.ini3
4 files changed, 9 insertions, 3 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5624a38..ce5588e 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -37,6 +37,8 @@
37 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 37 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
38 ; for the LocalGridServicesConnector which is used by the Remote one 38 ; for the LocalGridServicesConnector which is used by the Remote one
39 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 39 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
40
41 NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
40 42
41[LibraryService] 43[LibraryService]
42 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 44 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index e983755..5142d90 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -49,6 +49,8 @@
49 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 49 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
50 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 50 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
51 51
52 NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
53
52 ; Needed to display non-default map tile images for linked regions 54 ; Needed to display non-default map tile images for linked regions
53 AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 55 AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
54 56
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 29b51de..0b01116 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,7 +21,7 @@
21 Include-Common = "config-include/GridCommon.ini" 21 Include-Common = "config-include/GridCommon.ini"
22 22
23[Modules] 23[Modules]
24 GridServices = "SimianGridServiceConnector" 24 GridServices = "RemoteGridServicesConnector"
25 PresenceServices = "SimianPresenceServiceConnector" 25 PresenceServices = "SimianPresenceServiceConnector"
26 UserAccountServices = "SimianUserAccountServiceConnector" 26 UserAccountServices = "SimianUserAccountServiceConnector"
27 AuthenticationServices = "SimianAuthenticationServiceConnector" 27 AuthenticationServices = "SimianAuthenticationServiceConnector"
@@ -53,7 +53,8 @@
53[GridService] 53[GridService]
54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
55 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 55 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
56 56 NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
57
57 AllowHypergridMapSearch = true 58 AllowHypergridMapSearch = true
58 59
59[LibraryService] 60[LibraryService]
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 239ce30..311a55b 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,7 +21,7 @@
21 Include-Common = "config-include/GridCommon.ini" 21 Include-Common = "config-include/GridCommon.ini"
22 22
23[Modules] 23[Modules]
24 GridServices = "SimianGridServiceConnector" 24 GridServices = "RemoteGridServicesConnector"
25 PresenceServices = "SimianPresenceServiceConnector" 25 PresenceServices = "SimianPresenceServiceConnector"
26 UserAccountServices = "SimianUserAccountServiceConnector" 26 UserAccountServices = "SimianUserAccountServiceConnector"
27 AuthenticationServices = "SimianAuthenticationServiceConnector" 27 AuthenticationServices = "SimianAuthenticationServiceConnector"
@@ -53,6 +53,7 @@
53[GridService] 53[GridService]
54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
55 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 55 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
56 NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
56 57
57[LibraryService] 58[LibraryService]
58 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 59 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"