1 files changed, 77 insertions, 71 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 195e780..eaacfff 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,47 +5,49 @@
 ;;
 [Startup]
-        WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 [Modules]
-    AssetServices                       = "HGAssetBroker"
+    AssetServices           = "HGAssetBroker"
-    InventoryServices           = "HGInventoryBroker"
+    InventoryServices       = "HGInventoryBroker"
-    NeighbourServices           = "LocalNeighbourServicesConnector"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
-    AuthenticationServices      = "LocalAuthenticationServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
-    GridServices                        = "LocalGridServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
-    PresenceServices            = "LocalPresenceServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
-    UserAccountServices         = "LocalUserAccountServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
+    AgentPreferencesServices= "LocalAgentPreferencesServicesConnector"
    GridUserServices        = "LocalGridUserServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
+    SimulationServices      = "RemoteSimulationConnectorModule"
-    AvatarServices                      = "LocalAvatarServicesConnector"
+    AvatarServices          = "LocalAvatarServicesConnector"
-        MapImageService                 = "MapImageServiceModule"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
-    EntityTransferModule        = "HGEntityTransferModule"
+    MapImageService         = "MapImageServiceModule"
-    InventoryAccessModule       = "HGInventoryAccessModule"
+    EntityTransferModule    = "HGEntityTransferModule"
-    FriendsModule                       = "HGFriendsModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
-        UserManagementModule    = "HGUserManagementModule"
+    FriendsModule           = "HGFriendsModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
    
-    InventoryServiceInConnector                 = true
+    InventoryServiceInConnector       = true
-    AssetServiceInConnector                             = true
+    AssetServiceInConnector           = true
-    HypergridServiceInConnector                 = true
+    HypergridServiceInConnector       = true
-    NeighbourServiceInConnector                 = true
+    NeighbourServiceInConnector       = true
-    LibraryModule                                               = true
+    LibraryModule                     = true
-    LLLoginServiceInConnector                   = true
+    LLLoginServiceInConnector         = true
-        GridInfoServiceInConnector                      = true
+    GridInfoServiceInConnector        = true
-    AuthenticationServiceInConnector    = true
+    AuthenticationServiceInConnector  = true
-    SimulationServiceInConnector                = true
+    SimulationServiceInConnector      = true
-        MapImageServiceInConnector                      = true
+    MapImageServiceInConnector        = true
 [Messaging]
    MessageTransferModule = HGMessageTransferModule
    LureModule = HGLureModule
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 [AssetService]
    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
@@ -55,8 +57,6 @@
    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
    ; For HGInventoryBroker
    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
@@ -64,9 +64,9 @@
    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 [LibraryService]
-        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-        LibraryName = "OpenSim Library"
+    LibraryName = "OpenSim Library"
-        DefaultLibrary = "./inventory/Libraries.xml"
+    DefaultLibrary = "./inventory/Libraries.xml"
 [AuthenticationService]
    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -76,13 +76,13 @@
    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
    Realm = "regions"
    StorageProvider = "OpenSim.Data.Null.dll"
-        
    ; Needed to display non-default map tile images for remote regions
    AssetService = "OpenSim.Services.AssetService.dll:AssetService"
  
    HypergridLinker = true
    AllowHypergridMapSearch = true
-        
 [PresenceService]
    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
    StorageProvider = "OpenSim.Data.Null.dll"
@@ -109,22 +109,27 @@
 [Friends]
    Connector = "OpenSim.Services.FriendsService.dll"
+[AgentPreferencesService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService"
 [LoginService]
-    LocalServiceModule          = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService          = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService                     = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
-        UserAgentService                = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService      = "OpenSim.Services.HypergridService.dll:UserAgentService"
-    AuthenticationService       = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService            = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
-    PresenceService                     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService                         = "OpenSim.Services.GridService.dll:GridService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
-    AvatarService                       = "OpenSim.Services.AvatarService.dll:AvatarService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
   
+    ; This inventory service will be used to initialize the user's inventory
+    HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+    HGInventoryServiceConstructorArg = "HGInventoryService"
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-        ; in minutes
-        RefreshTime = 60
 [GatekeeperService]
    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -138,25 +143,27 @@
    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
 [UserAgentService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        ;; for the service
+    ;; for the service
    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
    GridService = "OpenSim.Services.GridService.dll:GridService"
-    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    GatekeeperService   = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
-    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAccountService  = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
-        
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
    ; For the InventoryServiceInConnector
    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
-        ;; alternatives:
+    ;; alternatives:
-        ;;  HG1.5, more permissive, not recommended, but still supported
+    ;;  HG1.5, more permissive, not recommended, but still supported
    ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
-        ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
    ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
    UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -169,20 +176,19 @@
    UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 [HGFriendsService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
-        UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        GridService = "OpenSim.Services.GridService.dll:GridService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
-        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 [HGInstantMessageService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-        GridService = "OpenSim.Services.GridService.dll:GridService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
-        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    PresenceService   = "OpenSim.Services.PresenceService.dll:PresenceService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService  = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        InGatekeeper = True
+    InGatekeeper = True
 ;; This should always be the very last thing on this file
 [Includes]

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 195e780..eaacfff 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,47 +5,49 @@
5	;;	5	;;
6		6
7	[Startup]	7	[Startup]
8	WorldMapModule = "HGWorldMap"	8	WorldMapModule = "HGWorldMap"
9		9
10	[Modules]	10	[Modules]
11	AssetServices = "HGAssetBroker"	11	AssetServices = "HGAssetBroker"
12	InventoryServices = "HGInventoryBroker"	12	InventoryServices = "HGInventoryBroker"
13	NeighbourServices = "LocalNeighbourServicesConnector"	13	NeighbourServices = "LocalNeighbourServicesConnector"
14	AuthenticationServices = "LocalAuthenticationServicesConnector"	14	AuthenticationServices = "LocalAuthenticationServicesConnector"
15	AuthorizationServices = "LocalAuthorizationServicesConnector"	15	AuthorizationServices = "LocalAuthorizationServicesConnector"
16	GridServices = "LocalGridServicesConnector"	16	GridServices = "LocalGridServicesConnector"
17	PresenceServices = "LocalPresenceServicesConnector"	17	PresenceServices = "LocalPresenceServicesConnector"
18	UserAccountServices = "LocalUserAccountServicesConnector"	18	UserAccountServices = "LocalUserAccountServicesConnector"
		19	AgentPreferencesServices= "LocalAgentPreferencesServicesConnector"
19	GridUserServices = "LocalGridUserServicesConnector"	20	GridUserServices = "LocalGridUserServicesConnector"
20	SimulationServices = "RemoteSimulationConnectorModule"	21	SimulationServices = "RemoteSimulationConnectorModule"
21	AvatarServices = "LocalAvatarServicesConnector"	22	AvatarServices = "LocalAvatarServicesConnector"
22	MapImageService = "MapImageServiceModule"	23	UserProfilesServices = "LocalUserProfilesServicesConnector"
23	EntityTransferModule = "HGEntityTransferModule"	24	MapImageService = "MapImageServiceModule"
24	InventoryAccessModule = "HGInventoryAccessModule"	25	EntityTransferModule = "HGEntityTransferModule"
25	FriendsModule = "HGFriendsModule"	26	InventoryAccessModule = "HGInventoryAccessModule"
26	UserManagementModule = "HGUserManagementModule"	27	FriendsModule = "HGFriendsModule"
		28	UserManagementModule = "HGUserManagementModule"
		29	SearchModule = "BasicSearchModule"
27		30
28	InventoryServiceInConnector = true	31	InventoryServiceInConnector = true
29	AssetServiceInConnector = true	32	AssetServiceInConnector = true
30	HypergridServiceInConnector = true	33	HypergridServiceInConnector = true
31	NeighbourServiceInConnector = true	34	NeighbourServiceInConnector = true
32	LibraryModule = true	35	LibraryModule = true
33	LLLoginServiceInConnector = true	36	LLLoginServiceInConnector = true
34	GridInfoServiceInConnector = true	37	GridInfoServiceInConnector = true
35	AuthenticationServiceInConnector = true	38	AuthenticationServiceInConnector = true
36	SimulationServiceInConnector = true	39	SimulationServiceInConnector = true
37	MapImageServiceInConnector = true	40	MapImageServiceInConnector = true
38
39		41
40	[Messaging]	42	[Messaging]
41	MessageTransferModule = HGMessageTransferModule	43	MessageTransferModule = HGMessageTransferModule
42	LureModule = HGLureModule	44	LureModule = HGLureModule
43		45
44	[SimulationDataStore]	46	[SimulationDataStore]
45	LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"	47	LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
46		48
47	[EstateDataStore]	49	[EstateDataStore]
48	LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"	50	LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
49		51
50	[AssetService]	52	[AssetService]
51	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	53	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -55,8 +57,6 @@
55	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"	57	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
56		58
57	[InventoryService]	59	[InventoryService]
58	LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
59
60	; For HGInventoryBroker	60	; For HGInventoryBroker
61	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	61	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
62		62
@@ -64,9 +64,9 @@
64	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"	64	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
65		65
66	[LibraryService]	66	[LibraryService]
67	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"	67	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
68	LibraryName = "OpenSim Library"	68	LibraryName = "OpenSim Library"
69	DefaultLibrary = "./inventory/Libraries.xml"	69	DefaultLibrary = "./inventory/Libraries.xml"
70		70
71	[AuthenticationService]	71	[AuthenticationService]
72	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	72	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -76,13 +76,13 @@
76	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	76	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
77	Realm = "regions"	77	Realm = "regions"
78	StorageProvider = "OpenSim.Data.Null.dll"	78	StorageProvider = "OpenSim.Data.Null.dll"
79		79
80	; Needed to display non-default map tile images for remote regions	80	; Needed to display non-default map tile images for remote regions
81	AssetService = "OpenSim.Services.AssetService.dll:AssetService"	81	AssetService = "OpenSim.Services.AssetService.dll:AssetService"
82		82
83	HypergridLinker = true	83	HypergridLinker = true
84	AllowHypergridMapSearch = true	84	AllowHypergridMapSearch = true
85		85
86	[PresenceService]	86	[PresenceService]
87	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"	87	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
88	StorageProvider = "OpenSim.Data.Null.dll"	88	StorageProvider = "OpenSim.Data.Null.dll"
@@ -109,22 +109,27 @@
109	[Friends]	109	[Friends]
110	Connector = "OpenSim.Services.FriendsService.dll"	110	Connector = "OpenSim.Services.FriendsService.dll"
111		111
		112	[AgentPreferencesService]
		113	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService"
		114
112	[LoginService]	115	[LoginService]
113	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"	116	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
114	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	117	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
115	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"	118	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
116	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"	119	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
117	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"	120	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
118	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"	121	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
119	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	122	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
120	GridService = "OpenSim.Services.GridService.dll:GridService"	123	GridService = "OpenSim.Services.GridService.dll:GridService"
121	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"	124	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
122	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"	125	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
123		126
		127	; This inventory service will be used to initialize the user's inventory
		128	HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
		129	HGInventoryServiceConstructorArg = "HGInventoryService"
		130
124	[MapImageService]	131	[MapImageService]
125	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"	132	LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
126	; in minutes
127	RefreshTime = 60
128		133
129	[GatekeeperService]	134	[GatekeeperService]
130	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"	135	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -138,25 +143,27 @@
138	SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"	143	SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
139		144
140	[UserAgentService]	145	[UserAgentService]
141	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"	146	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
142	;; for the service	147	;; for the service
143	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"	148	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
144	GridService = "OpenSim.Services.GridService.dll:GridService"	149	GridService = "OpenSim.Services.GridService.dll:GridService"
145	GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"	150	GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
146	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	151	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
147	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"	152	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
148	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	153	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		154
		155	;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
		156	CreateDefaultAvatarEntries = true
149		157
150
151	;; The interface that local users get when they are in other grids	158	;; The interface that local users get when they are in other grids
152	;; This greatly restricts the inventory operations while in other grids	159	;; This greatly restricts the inventory operations while in other grids
153	[HGInventoryService]	160	[HGInventoryService]
154	; For the InventoryServiceInConnector	161	; For the InventoryServiceInConnector
155	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"	162	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
156	;; alternatives:	163	;; alternatives:
157	;; HG1.5, more permissive, not recommended, but still supported	164	;; HG1.5, more permissive, not recommended, but still supported
158	;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"	165	;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
159	;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust	166	;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
160	;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"	167	;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
161		168
162	UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	169	UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
@@ -169,20 +176,19 @@
169	UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	176	UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
170		177
171	[HGFriendsService]	178	[HGFriendsService]
172	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"	179	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
173	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"	180	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
174	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"	181	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
175	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"	182	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
176	GridService = "OpenSim.Services.GridService.dll:GridService"	183	GridService = "OpenSim.Services.GridService.dll:GridService"
177	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	184	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
178		185
179	[HGInstantMessageService]	186	[HGInstantMessageService]
180	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"	187	LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
181	GridService = "OpenSim.Services.GridService.dll:GridService"	188	GridService = "OpenSim.Services.GridService.dll:GridService"
182	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"	189	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
183	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"	190	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
184	InGatekeeper = True	191	InGatekeeper = True
185
186		192
187	;; This should always be the very last thing on this file	193	;; This should always be the very last thing on this file
188	[Includes]	194	[Includes]