Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2015-01-22 10:45:46 -0800
committer: Diva Canto 2015-01-22 10:45:46 -0800
commit: edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch)
tree: 33ddce1499ec22dab20935148cacc24f9dc2031c /bin/config-include/Grid.ini
parent: On the GridService, the central simulator features: ensure that the map tile ... (diff)
parent: Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff)
download: opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz
1 files changed, 20 insertions, 20 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 42ecec2..4b01d82 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,27 +8,27 @@
    Include-Common = "config-include/GridCommon.ini"
 [Modules]
-    AssetServices                       = "RemoteAssetServicesConnector"
+    AssetServices           = "RemoteAssetServicesConnector"
-    InventoryServices           = "RemoteXInventoryServicesConnector"
+    InventoryServices       = "RemoteXInventoryServicesConnector"
-    GridServices                        = "RemoteGridServicesConnector"
+    GridServices            = "RemoteGridServicesConnector"
-    AvatarServices                      = "RemoteAvatarServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
-    NeighbourServices           = "RemoteNeighbourServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
-    AuthenticationServices      = "RemoteAuthenticationServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
-    PresenceServices            = "RemotePresenceServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
-    UserAccountServices         = "RemoteUserAccountServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
-    GridUserServices            = "RemoteGridUserServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
+    SimulationServices      = "RemoteSimulationConnectorModule"
-    EntityTransferModule        = "BasicEntityTransferModule"
+    EntityTransferModule    = "BasicEntityTransferModule"
-    InventoryAccessModule       = "BasicInventoryAccessModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
    LandServices            = "RemoteLandServicesConnector"
-    MapImageService                     = "MapImageServiceModule"
+    MapImageService         = "MapImageServiceModule"
-    SearchModule                        = "BasicSearchModule"
+    SearchModule            = "BasicSearchModule"
    
-    LandServiceInConnector                      = true
+    LandServiceInConnector        = true
-    NeighbourServiceInConnector         = true
+    NeighbourServiceInConnector   = true
-    SimulationServiceInConnector        = true
+    SimulationServiceInConnector  = true
-    LibraryModule                                       = true
+    LibraryModule                 = true
 [SimulationService]
    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -70,4 +70,4 @@
    Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
author	Diva Canto	2015-01-22 10:45:46 -0800
committer	Diva Canto	2015-01-22 10:45:46 -0800
commit	edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch)
tree	33ddce1499ec22dab20935148cacc24f9dc2031c /bin/config-include/Grid.ini
parent	On the GridService, the central simulator features: ensure that the map tile ... (diff)
parent	Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff)
download	opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2 opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 42ecec2..4b01d82 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -8,27 +8,27 @@
8	Include-Common = "config-include/GridCommon.ini"	8	Include-Common = "config-include/GridCommon.ini"
9		9
10	[Modules]	10	[Modules]
11	AssetServices = "RemoteAssetServicesConnector"	11	AssetServices = "RemoteAssetServicesConnector"
12	InventoryServices = "RemoteXInventoryServicesConnector"	12	InventoryServices = "RemoteXInventoryServicesConnector"
13	GridServices = "RemoteGridServicesConnector"	13	GridServices = "RemoteGridServicesConnector"
14	AvatarServices = "RemoteAvatarServicesConnector"	14	AvatarServices = "RemoteAvatarServicesConnector"
15	NeighbourServices = "RemoteNeighbourServicesConnector"	15	NeighbourServices = "RemoteNeighbourServicesConnector"
16	AuthenticationServices = "RemoteAuthenticationServicesConnector"	16	AuthenticationServices = "RemoteAuthenticationServicesConnector"
17	AuthorizationServices = "LocalAuthorizationServicesConnector"	17	AuthorizationServices = "LocalAuthorizationServicesConnector"
18	PresenceServices = "RemotePresenceServicesConnector"	18	PresenceServices = "RemotePresenceServicesConnector"
19	UserAccountServices = "RemoteUserAccountServicesConnector"	19	UserAccountServices = "RemoteUserAccountServicesConnector"
20	GridUserServices = "RemoteGridUserServicesConnector"	20	GridUserServices = "RemoteGridUserServicesConnector"
21	SimulationServices = "RemoteSimulationConnectorModule"	21	SimulationServices = "RemoteSimulationConnectorModule"
22	EntityTransferModule = "BasicEntityTransferModule"	22	EntityTransferModule = "BasicEntityTransferModule"
23	InventoryAccessModule = "BasicInventoryAccessModule"	23	InventoryAccessModule = "BasicInventoryAccessModule"
24	LandServices = "RemoteLandServicesConnector"	24	LandServices = "RemoteLandServicesConnector"
25	MapImageService = "MapImageServiceModule"	25	MapImageService = "MapImageServiceModule"
26	SearchModule = "BasicSearchModule"	26	SearchModule = "BasicSearchModule"
27		27
28	LandServiceInConnector = true	28	LandServiceInConnector = true
29	NeighbourServiceInConnector = true	29	NeighbourServiceInConnector = true
30	SimulationServiceInConnector = true	30	SimulationServiceInConnector = true
31	LibraryModule = true	31	LibraryModule = true
32		32
33	[SimulationService]	33	[SimulationService]
34	; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport	34	; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -70,4 +70,4 @@
70	Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"	70	Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
71		71
72	[MapImageService]	72	[MapImageService]
73	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"	73	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"