Merge branch 'master' into httptests

author: UbitUmarov 2017-05-31 07:21:21 +0100
committer: UbitUmarov 2017-05-31 07:21:21 +0100
commit: 55babdc16090397499081f0428500babe383ff3a (patch)
tree: efb2f7ec13abba489d6318ebace8a86c6cde66c6 /bin
parent: disable llhttprequests secure con, since it still collides with main ssl sett... (diff)
parent: we don't need to keep refs to baked textures assets (diff)
download: opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip
opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz
opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2
opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz
6 files changed, 6 insertions, 6 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index fc98879..988e681 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,7 +12,7 @@
    InventoryServices       = "RemoteXInventoryServicesConnector"
    GridServices            = "RemoteGridServicesConnector"
    AvatarServices          = "RemoteAvatarServicesConnector"
-    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
    AuthorizationServices   = "LocalAuthorizationServicesConnector"
    PresenceServices        = "RemotePresenceServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f5f4c87..68f2eb1 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -15,7 +15,7 @@
    InventoryServices       = "HGInventoryBroker"
    GridServices            = "RemoteGridServicesConnector"
    AvatarServices          = "RemoteAvatarServicesConnector"
-    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
    AuthorizationServices   = "LocalAuthorizationServicesConnector"
    PresenceServices        = "RemotePresenceServicesConnector"
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index efad577..018c65e 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -29,7 +29,7 @@
    InventoryServices = "HGInventoryBroker"
    AvatarServices = "SimianAvatarServiceConnector"
    
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices = "NeighbourServicesOutConnector"
    SimulationServices = "RemoteSimulationConnectorModule"
    EntityTransferModule = "HGEntityTransferModule"
    InventoryAccessModule = "HGInventoryAccessModule"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 5749656..b3db08a 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -29,7 +29,7 @@
    InventoryServices = "SimianInventoryServiceConnector"
    AvatarServices = "SimianAvatarServiceConnector"
    
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices = "NeighbourServicesOutConnector"
    SimulationServices = "RemoteSimulationConnectorModule"
    EntityTransferModule = "BasicEntityTransferModule"
    InventoryAccessModule = "BasicInventoryAccessModule"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 78ada2b..db7cb36 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -7,7 +7,7 @@
 [Modules]
    AssetServices           = "LocalAssetServicesConnector"
    InventoryServices       = "LocalInventoryServicesConnector"
-    NeighbourServices       = "LocalNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
    AuthenticationServices  = "LocalAuthenticationServicesConnector"
    AuthorizationServices   = "LocalAuthorizationServicesConnector"
    GridServices            = "LocalGridServicesConnector"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index eaacfff..84867a9 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,7 +10,7 @@
 [Modules]
    AssetServices           = "HGAssetBroker"
    InventoryServices       = "HGInventoryBroker"
-    NeighbourServices       = "LocalNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
    AuthenticationServices  = "LocalAuthenticationServicesConnector"
    AuthorizationServices   = "LocalAuthorizationServicesConnector"
    GridServices            = "LocalGridServicesConnector"
author	UbitUmarov	2017-05-31 07:21:21 +0100
committer	UbitUmarov	2017-05-31 07:21:21 +0100
commit	55babdc16090397499081f0428500babe383ff3a (patch)
tree	efb2f7ec13abba489d6318ebace8a86c6cde66c6 /bin
parent	disable llhttprequests secure con, since it still collides with main ssl sett... (diff)
parent	we don't need to keep refs to baked textures assets (diff)
download	opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2 opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index fc98879..988e681 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -12,7 +12,7 @@
12	InventoryServices = "RemoteXInventoryServicesConnector"	12	InventoryServices = "RemoteXInventoryServicesConnector"
13	GridServices = "RemoteGridServicesConnector"	13	GridServices = "RemoteGridServicesConnector"
14	AvatarServices = "RemoteAvatarServicesConnector"	14	AvatarServices = "RemoteAvatarServicesConnector"
15	NeighbourServices = "RemoteNeighbourServicesConnector"	15	NeighbourServices = "NeighbourServicesOutConnector"
16	AuthenticationServices = "RemoteAuthenticationServicesConnector"	16	AuthenticationServices = "RemoteAuthenticationServicesConnector"
17	AuthorizationServices = "LocalAuthorizationServicesConnector"	17	AuthorizationServices = "LocalAuthorizationServicesConnector"
18	PresenceServices = "RemotePresenceServicesConnector"	18	PresenceServices = "RemotePresenceServicesConnector"


diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index f5f4c87..68f2eb1 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini
@@ -15,7 +15,7 @@
15	InventoryServices = "HGInventoryBroker"	15	InventoryServices = "HGInventoryBroker"
16	GridServices = "RemoteGridServicesConnector"	16	GridServices = "RemoteGridServicesConnector"
17	AvatarServices = "RemoteAvatarServicesConnector"	17	AvatarServices = "RemoteAvatarServicesConnector"
18	NeighbourServices = "RemoteNeighbourServicesConnector"	18	NeighbourServices = "NeighbourServicesOutConnector"
19	AuthenticationServices = "RemoteAuthenticationServicesConnector"	19	AuthenticationServices = "RemoteAuthenticationServicesConnector"
20	AuthorizationServices = "LocalAuthorizationServicesConnector"	20	AuthorizationServices = "LocalAuthorizationServicesConnector"
21	PresenceServices = "RemotePresenceServicesConnector"	21	PresenceServices = "RemotePresenceServicesConnector"


diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index efad577..018c65e 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini
@@ -29,7 +29,7 @@
29	InventoryServices = "HGInventoryBroker"	29	InventoryServices = "HGInventoryBroker"
30	AvatarServices = "SimianAvatarServiceConnector"	30	AvatarServices = "SimianAvatarServiceConnector"
31		31
32	NeighbourServices = "RemoteNeighbourServicesConnector"	32	NeighbourServices = "NeighbourServicesOutConnector"
33	SimulationServices = "RemoteSimulationConnectorModule"	33	SimulationServices = "RemoteSimulationConnectorModule"
34	EntityTransferModule = "HGEntityTransferModule"	34	EntityTransferModule = "HGEntityTransferModule"
35	InventoryAccessModule = "HGInventoryAccessModule"	35	InventoryAccessModule = "HGInventoryAccessModule"


diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index 5749656..b3db08a 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini
@@ -29,7 +29,7 @@
29	InventoryServices = "SimianInventoryServiceConnector"	29	InventoryServices = "SimianInventoryServiceConnector"
30	AvatarServices = "SimianAvatarServiceConnector"	30	AvatarServices = "SimianAvatarServiceConnector"
31		31
32	NeighbourServices = "RemoteNeighbourServicesConnector"	32	NeighbourServices = "NeighbourServicesOutConnector"
33	SimulationServices = "RemoteSimulationConnectorModule"	33	SimulationServices = "RemoteSimulationConnectorModule"
34	EntityTransferModule = "BasicEntityTransferModule"	34	EntityTransferModule = "BasicEntityTransferModule"
35	InventoryAccessModule = "BasicInventoryAccessModule"	35	InventoryAccessModule = "BasicInventoryAccessModule"


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 78ada2b..db7cb36 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -7,7 +7,7 @@
7	[Modules]	7	[Modules]
8	AssetServices = "LocalAssetServicesConnector"	8	AssetServices = "LocalAssetServicesConnector"
9	InventoryServices = "LocalInventoryServicesConnector"	9	InventoryServices = "LocalInventoryServicesConnector"
10	NeighbourServices = "LocalNeighbourServicesConnector"	10	NeighbourServices = "NeighbourServicesOutConnector"
11	AuthenticationServices = "LocalAuthenticationServicesConnector"	11	AuthenticationServices = "LocalAuthenticationServicesConnector"
12	AuthorizationServices = "LocalAuthorizationServicesConnector"	12	AuthorizationServices = "LocalAuthorizationServicesConnector"
13	GridServices = "LocalGridServicesConnector"	13	GridServices = "LocalGridServicesConnector"


diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index eaacfff..84867a9 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,7 +10,7 @@
10	[Modules]	10	[Modules]
11	AssetServices = "HGAssetBroker"	11	AssetServices = "HGAssetBroker"
12	InventoryServices = "HGInventoryBroker"	12	InventoryServices = "HGInventoryBroker"
13	NeighbourServices = "LocalNeighbourServicesConnector"	13	NeighbourServices = "NeighbourServicesOutConnector"
14	AuthenticationServices = "LocalAuthenticationServicesConnector"	14	AuthenticationServices = "LocalAuthenticationServicesConnector"
15	AuthorizationServices = "LocalAuthorizationServicesConnector"	15	AuthorizationServices = "LocalAuthorizationServicesConnector"
16	GridServices = "LocalGridServicesConnector"	16	GridServices = "LocalGridServicesConnector"