1 files changed, 97 insertions, 27 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..130e210 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,28 +3,31 @@
 ;; All optional settings are in StandaloneCommon.ini.example,
 ;; which you can copy and change.
 ;;
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-[Startup]
-        hypergrid = true
        
 [Modules]
-    AssetServices = "HGAssetBroker"
+    AssetServices                       = "HGAssetBroker"
-    InventoryServices = "HGInventoryBroker"
+    InventoryServices           = "HGInventoryBroker"
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+    NeighbourServices           = "LocalNeighbourServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
+    AuthenticationServices      = "LocalAuthenticationServicesConnector"
-    GridServices = "HGGridServicesConnector"
+    GridServices                        = "LocalGridServicesConnector"
-    InventoryServiceInConnector = true
+    PresenceServices            = "LocalPresenceServicesConnector"
-    AssetServiceInConnector = true
+    UserAccountServices         = "LocalUserAccountServicesConnector"
-    HGAuthServiceInConnector = true
+    GridUserServices        = "LocalGridUserServicesConnector"
-    HypergridServiceInConnector = true
+    SimulationServices          = "RemoteSimulationConnectorModule"
-    NeighbourServiceInConnector = true
+    AvatarServices                      = "LocalAvatarServicesConnector"
-    LibraryModule = true
+    EntityTransferModule        = "HGEntityTransferModule"
+    InventoryAccessModule       = "HGInventoryAccessModule"
+    
+    InventoryServiceInConnector                 = true
+    AssetServiceInConnector                             = true
+    HypergridServiceInConnector                 = true
+    NeighbourServiceInConnector                 = true
+    LibraryModule                                               = true
+    LLLoginServiceInConnector                   = true
+    AuthenticationServiceInConnector    = true
+    SimulationServiceInConnector                = true
 [AssetService]
-    ; For the AssetServiceInConnector
    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
    ; For HGAssetBroker
@@ -32,23 +35,90 @@
    HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 [InventoryService]
-    ; For the InventoryServiceInConnector
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
    ; For HGInventoryBroker
-    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
-    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+[AvatarService]
+    LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
+    ConnectionString = "URI=file:avatars.db,version=3"
+[LibraryService]
+        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+        LibraryName = "OpenSim Library"
+        DefaultLibrary = "./inventory/Libraries.xml"
 [AuthorizationService]
    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 [AuthenticationService]
-    ; For the HGAuthServiceInConnector
+    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
+    ConnectionString = "URI=file:auth.db,version=3"
-    
 [GridService]
-    ; for the HGGridServicesConnector to instantiate
-        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
        ; LocalGridServicesConnector needs this
        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
        Realm = "regions"
+    StorageProvider = "OpenSim.Data.Null.dll"
+        
+        AllowHypergridMapSearch = true
+        
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.Null.dll"
+[UserAccountService]
+    LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    ;; These are for creating new accounts by the service
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+[FriendsService]
+    LocalServiceModule = "OpenSim.Services.FriendsService.dll"
+    ConnectionString = "URI=file:friends.db,version=3"
+[Friends]
+    Connector = "OpenSim.Services.FriendsService.dll"
+[LoginService]
+    LocalServiceModule          = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService          = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService                     = "OpenSim.Services.UserAccountService.dll:GridUserService"
+        UserAgentService                = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService       = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService            = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    PresenceService                     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService                         = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService                       = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    
+[GatekeeperService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    ;; for the service
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
+    SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
+[UserAgentService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        ;; for the service
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+        
+;; 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.InventoryService.dll:HGInventoryService"
+;; This should always be the very last thing on this file
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 909286c..130e210 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,28 +3,31 @@
3	;; All optional settings are in StandaloneCommon.ini.example,	3	;; All optional settings are in StandaloneCommon.ini.example,
4	;; which you can copy and change.	4	;; which you can copy and change.
5	;;	5	;;
6
7	[Includes]
8	Include-Common = "config-include/StandaloneCommon.ini"
9
10	[Startup]
11	hypergrid = true
12		6
13	[Modules]	7	[Modules]
14	AssetServices = "HGAssetBroker"	8	AssetServices = "HGAssetBroker"
15	InventoryServices = "HGInventoryBroker"	9	InventoryServices = "HGInventoryBroker"
16	NeighbourServices = "RemoteNeighbourServicesConnector"	10	NeighbourServices = "LocalNeighbourServicesConnector"
17	AuthorizationServices = "LocalAuthorizationServicesConnector"	11	AuthenticationServices = "LocalAuthenticationServicesConnector"
18	GridServices = "HGGridServicesConnector"	12	GridServices = "LocalGridServicesConnector"
19	InventoryServiceInConnector = true	13	PresenceServices = "LocalPresenceServicesConnector"
20	AssetServiceInConnector = true	14	UserAccountServices = "LocalUserAccountServicesConnector"
21	HGAuthServiceInConnector = true	15	GridUserServices = "LocalGridUserServicesConnector"
22	HypergridServiceInConnector = true	16	SimulationServices = "RemoteSimulationConnectorModule"
23	NeighbourServiceInConnector = true	17	AvatarServices = "LocalAvatarServicesConnector"
24	LibraryModule = true	18	EntityTransferModule = "HGEntityTransferModule"
		19	InventoryAccessModule = "HGInventoryAccessModule"
		20
		21	InventoryServiceInConnector = true
		22	AssetServiceInConnector = true
		23	HypergridServiceInConnector = true
		24	NeighbourServiceInConnector = true
		25	LibraryModule = true
		26	LLLoginServiceInConnector = true
		27	AuthenticationServiceInConnector = true
		28	SimulationServiceInConnector = true
25		29
26	[AssetService]	30	[AssetService]
27	; For the AssetServiceInConnector
28	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	31	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
29		32
30	; For HGAssetBroker	33	; For HGAssetBroker
@@ -32,23 +35,90 @@
32	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"	35	HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
33		36
34	[InventoryService]	37	[InventoryService]
35	; For the InventoryServiceInConnector	38	LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
36	LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
37		39
38	; For HGInventoryBroker	40	; For HGInventoryBroker
39	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"	41	LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
40	HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"	42
		43	[AvatarService]
		44	LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
		45	ConnectionString = "URI=file:avatars.db,version=3"
		46
		47	[LibraryService]
		48	LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
		49	LibraryName = "OpenSim Library"
		50	DefaultLibrary = "./inventory/Libraries.xml"
41		51
42	[AuthorizationService]	52	[AuthorizationService]
43	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"	53	LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
44		54
45	[AuthenticationService]	55	[AuthenticationService]
46	; For the HGAuthServiceInConnector	56	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
47	LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"	57	ConnectionString = "URI=file:auth.db,version=3"
48		58
49	[GridService]	59	[GridService]
50	; for the HGGridServicesConnector to instantiate
51	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
52	; LocalGridServicesConnector needs this	60	; LocalGridServicesConnector needs this
53	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"	61	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54	Realm = "regions"	62	Realm = "regions"
		63	StorageProvider = "OpenSim.Data.Null.dll"
		64
		65	AllowHypergridMapSearch = true
		66
		67	[PresenceService]
		68	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
		69	StorageProvider = "OpenSim.Data.Null.dll"
		70
		71	[UserAccountService]
		72	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		73
		74	;; These are for creating new accounts by the service
		75	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		76	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
		77	GridService = "OpenSim.Services.GridService.dll:GridService"
		78	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
		79
		80	[FriendsService]
		81	LocalServiceModule = "OpenSim.Services.FriendsService.dll"
		82	ConnectionString = "URI=file:friends.db,version=3"
		83
		84	[Friends]
		85	Connector = "OpenSim.Services.FriendsService.dll"
		86
		87	[LoginService]
		88	LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
		89	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		90	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
		91	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
		92	AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
		93	InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
		94	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		95	GridService = "OpenSim.Services.GridService.dll:GridService"
		96	AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
		97	FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
		98
		99	[GatekeeperService]
		100	LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
		101	;; for the service
		102	UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
		103	UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
		104	PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
		105	GridService = "OpenSim.Services.GridService.dll:GridService"
		106	AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
		107	SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
		108
		109	[UserAgentService]
		110	LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
		111	;; for the service
		112	GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
		113	GridService = "OpenSim.Services.GridService.dll:GridService"
		114
		115	;; The interface that local users get when they are in other grids
		116	;; This greatly restricts the inventory operations while in other grids
		117	[HGInventoryService]
		118	; For the InventoryServiceInConnector
		119	LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
		120
		121
		122	;; This should always be the very last thing on this file
		123	[Includes]
		124	Include-Common = "config-include/StandaloneCommon.ini"