aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-03 11:44:57 -0800
committerDiva Canto2010-01-03 11:44:57 -0800
commit99efa99585639c94fdb484681663ac7b6f03538e (patch)
treef74eb3e9c080e381d37b2d936ba9b0c091196f56
parent* Changed ISimulation interface to take a GridRegion as input arg instead of ... (diff)
downloadopensim-SC_OLD-99efa99585639c94fdb484681663ac7b6f03538e.zip
opensim-SC_OLD-99efa99585639c94fdb484681663ac7b6f03538e.tar.gz
opensim-SC_OLD-99efa99585639c94fdb484681663ac7b6f03538e.tar.bz2
opensim-SC_OLD-99efa99585639c94fdb484681663ac7b6f03538e.tar.xz
Successfully logged into a grid.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs19
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs24
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs4
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs13
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs11
-rw-r--r--bin/OpenSim.Server.ini.example89
-rw-r--r--bin/config-include/GridCommon.ini.example18
-rw-r--r--bin/config-include/GridHypergrid.ini19
9 files changed, 138 insertions, 62 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
index ecb6c91..2a9366c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
@@ -109,6 +109,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
109 109
110 public void RegionLoaded(Scene scene) 110 public void RegionLoaded(Scene scene)
111 { 111 {
112 if (!m_Enabled)
113 return;
114
112 if (!m_Registered) 115 if (!m_Registered)
113 { 116 {
114 m_Registered = true; 117 m_Registered = true;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 03a5124..5ee1c97 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -91,6 +91,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
91 if (!m_Enabled) 91 if (!m_Enabled)
92 return; 92 return;
93 93
94 }
95
96 public void RemoveRegion(Scene scene)
97 {
98 }
99
100 public void RegionLoaded(Scene scene)
101 {
102 if (!m_Enabled)
103 return;
104
94 if (!m_Registered) 105 if (!m_Registered)
95 { 106 {
96 m_Registered = true; 107 m_Registered = true;
@@ -103,14 +114,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
103 } 114 }
104 } 115 }
105 116
106 public void RemoveRegion(Scene scene)
107 {
108 }
109
110 public void RegionLoaded(Scene scene)
111 {
112 }
113
114 #endregion 117 #endregion
115 118
116 } 119 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index b7dc283..c9cc368 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -103,6 +103,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
103 103
104 public void AddRegion(Scene scene) 104 public void AddRegion(Scene scene)
105 { 105 {
106 if (!m_enabled)
107 return;
108
109 if (!initialized)
110 {
111 InitOnce(scene);
112 initialized = true;
113 }
114 InitEach(scene);
106 } 115 }
107 116
108 public void RemoveRegion(Scene scene) 117 public void RemoveRegion(Scene scene)
@@ -116,15 +125,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
116 125
117 public void RegionLoaded(Scene scene) 126 public void RegionLoaded(Scene scene)
118 { 127 {
119 if (m_enabled) 128 if (!m_enabled)
120 { 129 return;
121 if (!initialized) 130
122 { 131 m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>();
123 InitOnce(scene); 132
124 initialized = true;
125 }
126 InitEach(scene);
127 }
128 } 133 }
129 134
130 public Type ReplaceableInterface 135 public Type ReplaceableInterface
@@ -148,7 +153,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
148 m_localBackend = new LocalSimulationConnectorModule(); 153 m_localBackend = new LocalSimulationConnectorModule();
149 m_commsManager = scene.CommsManager; 154 m_commsManager = scene.CommsManager;
150 m_aScene = scene; 155 m_aScene = scene;
151 m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>();
152 //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); 156 //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
153 m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName); 157 m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
154 } 158 }
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index f4f3eea..ccb4c70 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -134,8 +134,12 @@ namespace OpenSim.Server.Handlers.Simulation
134 uint teleportFlags = 0; 134 uint teleportFlags = 0;
135 if (args.ContainsKey("destination_x") && args["destination_x"] != null) 135 if (args.ContainsKey("destination_x") && args["destination_x"] != null)
136 Int32.TryParse(args["destination_x"].AsString(), out x); 136 Int32.TryParse(args["destination_x"].AsString(), out x);
137 else
138 m_log.WarnFormat(" -- request didn't have destination_x");
137 if (args.ContainsKey("destination_y") && args["destination_y"] != null) 139 if (args.ContainsKey("destination_y") && args["destination_y"] != null)
138 Int32.TryParse(args["destination_y"].AsString(), out y); 140 Int32.TryParse(args["destination_y"].AsString(), out y);
141 else
142 m_log.WarnFormat(" -- request didn't have destination_y");
139 if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null) 143 if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
140 UUID.TryParse(args["destination_uuid"].AsString(), out uuid); 144 UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
141 if (args.ContainsKey("destination_name") && args["destination_name"] != null) 145 if (args.ContainsKey("destination_name") && args["destination_name"] != null)
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index fcf07c7..dc532d0 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -39,6 +39,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
39using OpenMetaverse; 39using OpenMetaverse;
40using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
41using log4net; 41using log4net;
42using Nini.Config;
42 43
43namespace OpenSim.Services.Connectors.Simulation 44namespace OpenSim.Services.Connectors.Simulation
44{ 45{
@@ -52,7 +53,7 @@ namespace OpenSim.Services.Connectors.Simulation
52 { 53 {
53 } 54 }
54 55
55 public SimulationServiceConnector(GridRegion region) 56 public SimulationServiceConnector(IConfigSource config)
56 { 57 {
57 //m_Region = region; 58 //m_Region = region;
58 } 59 }
@@ -68,6 +69,13 @@ namespace OpenSim.Services.Connectors.Simulation
68 { 69 {
69 reason = String.Empty; 70 reason = String.Empty;
70 71
72 if (destination == null)
73 {
74 reason = "Destination is null";
75 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
76 return false;
77 }
78
71 // Eventually, we want to use a caps url instead of the agentID 79 // Eventually, we want to use a caps url instead of the agentID
72 string uri = string.Empty; 80 string uri = string.Empty;
73 try 81 try
@@ -128,7 +136,8 @@ namespace OpenSim.Services.Connectors.Simulation
128 AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send 136 AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send
129 os = AgentCreateRequest.GetRequestStream(); 137 os = AgentCreateRequest.GetRequestStream();
130 os.Write(buffer, 0, strBuffer.Length); //Send it 138 os.Write(buffer, 0, strBuffer.Length); //Send it
131 //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateChildAgent request to remote sim {0}", uri); 139 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}",
140 uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY);
132 } 141 }
133 //catch (WebException ex) 142 //catch (WebException ex)
134 catch 143 catch
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 638fa9f..2ae552f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -26,11 +26,11 @@ namespace OpenSim.Services.LLLoginService
26 private IGridService m_GridService; 26 private IGridService m_GridService;
27 private IPresenceService m_PresenceService; 27 private IPresenceService m_PresenceService;
28 private ISimulationService m_LocalSimulationService; 28 private ISimulationService m_LocalSimulationService;
29 private ISimulationService m_RemoteSimulationService;
29 private ILibraryService m_LibraryService; 30 private ILibraryService m_LibraryService;
30 private IAvatarService m_AvatarService; 31 private IAvatarService m_AvatarService;
31 32
32 private string m_DefaultRegionName; 33 private string m_DefaultRegionName;
33 private string m_RemoteSimulationDll;
34 private string m_WelcomeMessage; 34 private string m_WelcomeMessage;
35 private bool m_RequireInventory; 35 private bool m_RequireInventory;
36 36
@@ -47,9 +47,9 @@ namespace OpenSim.Services.LLLoginService
47 string presenceService = serverConfig.GetString("PresenceService", String.Empty); 47 string presenceService = serverConfig.GetString("PresenceService", String.Empty);
48 string libService = serverConfig.GetString("LibraryService", String.Empty); 48 string libService = serverConfig.GetString("LibraryService", String.Empty);
49 string avatarService = serverConfig.GetString("AvatarService", String.Empty); 49 string avatarService = serverConfig.GetString("AvatarService", String.Empty);
50 string simulationService = serverConfig.GetString("SimulationService", String.Empty);
50 51
51 m_DefaultRegionName = serverConfig.GetString("DefaultRegion", String.Empty); 52 m_DefaultRegionName = serverConfig.GetString("DefaultRegion", String.Empty);
52 m_RemoteSimulationDll = serverConfig.GetString("RemoteSimulationService", String.Empty);
53 m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); 53 m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
54 m_RequireInventory = serverConfig.GetBoolean("RequireInventory", true); 54 m_RequireInventory = serverConfig.GetBoolean("RequireInventory", true);
55 55
@@ -67,6 +67,8 @@ namespace OpenSim.Services.LLLoginService
67 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args); 67 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
68 if (avatarService != string.Empty) 68 if (avatarService != string.Empty)
69 m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarService, args); 69 m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarService, args);
70 if (simulationService != string.Empty)
71 m_RemoteSimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
70 // 72 //
71 // deal with the services given as argument 73 // deal with the services given as argument
72 // 74 //
@@ -184,8 +186,8 @@ namespace OpenSim.Services.LLLoginService
184 // independent login servers have just a remoteSimulationDll 186 // independent login servers have just a remoteSimulationDll
185 if (!startLocation.Contains("@") && (m_LocalSimulationService != null)) 187 if (!startLocation.Contains("@") && (m_LocalSimulationService != null))
186 simConnector = m_LocalSimulationService; 188 simConnector = m_LocalSimulationService;
187 else if (m_RemoteSimulationDll != string.Empty) 189 else if (m_RemoteSimulationService != null)
188 simConnector = ServerUtils.LoadPlugin<ISimulationService>(m_RemoteSimulationDll, args); 190 simConnector = m_RemoteSimulationService;
189 if (simConnector != null) 191 if (simConnector != null)
190 { 192 {
191 circuitCode = (uint)Util.RandomClass.Next(); ; 193 circuitCode = (uint)Util.RandomClass.Next(); ;
@@ -362,6 +364,7 @@ namespace OpenSim.Services.LLLoginService
362 //aCircuit.BaseFolder = irrelevant 364 //aCircuit.BaseFolder = irrelevant
363 aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); 365 aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
364 aCircuit.child = false; // the first login agent is root 366 aCircuit.child = false; // the first login agent is root
367 aCircuit.ChildrenCapSeeds = new Dictionary<ulong, string>();
365 aCircuit.circuitcode = circuit; 368 aCircuit.circuitcode = circuit;
366 aCircuit.firstname = account.FirstName; 369 aCircuit.firstname = account.FirstName;
367 //aCircuit.InventoryFolder = irrelevant 370 //aCircuit.InventoryFolder = irrelevant
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index f3d222f..b93bbd6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -1,21 +1,22 @@
1; * The startup section lists all the connectors to start up in this server 1; * The startup section lists all the connectors to start up in this server
2; * instance. This may be only one, or it may be the entire server suite. 2; * instance. This may be only one, or it may be the entire server suite.
3; * Multiple connectors should be seaprated by commas. 3; * Multiple connectors should be seaprated by commas.
4; * The startup section lists all the connectors to start up in this server
5; * instance. This may be only one, or it may be the entire server suite.
6; * Multiple connectors should be seaprated by commas.
4; * 7; *
5; * These are the IN connectors the server uses, the in connectors 8; * These are the IN connectors the server uses, the in connectors
6; * read this config file and load the needed OUT and database connectors 9; * read this config file and load the needed service and database connectors
7; * 10; *
8; * Add "OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" to
9; * enable the experimental authentication service
10; * 11; *
11[Startup] 12[Startup]
12ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector" 13ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,,OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
13 14
14; * This is common for all services, it's the network setup for the entire 15; * This is common for all services, it's the network setup for the entire
15; * server instance 16; * server instance
16; * 17; *
17[Network] 18[Network]
18port = 8003 19 port = 8003
19 20
20; * The following are for the remote console 21; * The following are for the remote console
21; * They have no effect for the local or basic console types 22; * They have no effect for the local or basic console types
@@ -29,25 +30,35 @@ port = 8003
29; * in turn, reads the asset loader and database connection information 30; * in turn, reads the asset loader and database connection information
30; * 31; *
31[AssetService] 32[AssetService]
32LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 33 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
33DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 34 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
34AssetLoaderArgs = "assets/AssetSets.xml" 35 AssetLoaderArgs = "assets/AssetSets.xml"
35StorageProvider = "OpenSim.Data.MySQL.dll" 36 StorageProvider = "OpenSim.Data.MySQL.dll"
36ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 37 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
37 38
38; * This configuration loads the inventory server modules. It duplicates 39; * This configuration loads the inventory server modules. It duplicates
39; * the function of the legacy inventory server 40; * the function of the legacy inventory server
40; * 41; *
41[InventoryService] 42[InventoryService]
42LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 43 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
43UserServerURI = "http://127.0.0.1:8002" 44 UserServerURI = "http://127.0.0.1:8002"
44SessionAuthentication = "false" 45 SessionAuthentication = "false"
45StorageProvider = "OpenSim.Data.MySQL.dll" 46 StorageProvider = "OpenSim.Data.MySQL.dll"
46ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 47 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
48
49; * This is the new style grid service.
50; * "Realm" is the table that is used for user lookup.
51; * It defaults to "regions", which uses the legacy tables
52; *
53[GridService]
54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
55 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
56 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
57 Realm = "regions"
47 58
48; * This is the configuration for the freeswitch server in grid mode 59; * This is the configuration for the freeswitch server in grid mode
49[FreeswitchService] 60[FreeswitchService]
50LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 61 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
51 62
52; * This is the new style authentication service. Currently, only MySQL 63; * This is the new style authentication service. Currently, only MySQL
53; * is implemented. "Realm" is the table that is used for user lookup. 64; * is implemented. "Realm" is the table that is used for user lookup.
@@ -55,27 +66,39 @@ LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
55; * as an authentication source. 66; * as an authentication source.
56; * 67; *
57[AuthenticationService] 68[AuthenticationService]
58AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 69 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
59StorageProvider = "OpenSim.Data.MySQL.dll" 70 StorageProvider = "OpenSim.Data.MySQL.dll"
60ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 71 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
61; Realm = "users"
62 72
63; * This is the new style user service. 73; * This is the new style user service.
64; * "Realm" is the table that is used for user lookup. 74; * "Realm" is the table that is used for user lookup.
65; * It defaults to "users", which uses the legacy tables 75; * It defaults to "users", which uses the legacy tables
66; * 76; *
67[UserAccountService] 77[UserAccountService]
68AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService" 78 AuthenticationServiceModule = "OpenSim.Services.UserService.dll:UserAccountService"
69StorageProvider = "OpenSim.Data.MySQL.dll" 79 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
70ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" 80 StorageProvider = "OpenSim.Data.MySQL.dll"
71; Realm = "users" 81 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
82 ; Realm = "useraccounts"
72 83
73; * This is the new style grid service. 84[PresenceService]
74; * "Realm" is the table that is used for user lookup. 85 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
75; * It defaults to "regions", which uses the legacy tables 86 StorageProvider = "OpenSim.Data.MySQL.dll"
76; * 87 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
77[GridService] 88
78LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 89[LibraryService]
79StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 90 LibraryName = "OpenSim Library"
80ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;" 91 DefaultLibrary = "./inventory/Libraries.xml"
81Realm = "regions" 92
93[LoginService]
94 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
95 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
96 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
97 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
98 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
99 GridService = "OpenSim.Services.GridService.dll:GridService"
100 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
101 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
102
103 DefaultRegion = "OpenSim Test"
104 WelcomeMessage = "Welcome, Avatar!"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 6da0f1e..6a65523 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -21,6 +21,24 @@
21 ; 21 ;
22 GridServerURI = "http://mygridserver.com:8003" 22 GridServerURI = "http://mygridserver.com:8003"
23 23
24[PresenceService]
25 ;
26 ; change this to your grid-wide presence server
27 ;
28 PresenceServerURI = "http://mygridserver.com:8003"
29
30[UserAccountService]
31 ;
32 ; change this to your grid-wide user accounts server
33 ;
34 UserAccountServerURI = "http://mygridserver.com:8003"
35
36[AuthenticationService]
37 ;
38 ; change this to your grid-wide authentication server
39 ;
40 AuthenticationServerURI = "http://mygridserver.com:8003"
41
24[Modules] 42[Modules]
25 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 43 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
26 ;; Copy the config .example file into your own .ini file and change configs there 44 ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index a5fe6e9..94b9f69 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -13,12 +13,21 @@
13[Modules] 13[Modules]
14 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
15 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
16 NeighbourServices = "RemoteNeighbourServicesConnector"
17 GridServices = "HGGridServicesConnector" 16 GridServices = "HGGridServicesConnector"
18 NeighbourServiceInConnector = true 17 NeighbourServices = "RemoteNeighbourServicesConnector"
18 AuthenticationServices = "RemoteAuthenticationServicesConnector"
19 AuthorizationServices = "LocalAuthorizationServicesConnector"
20 PresenceServices = "RemotePresenceServicesConnector"
21 UserAccountServices = "RemoteUserAccountServicesConnector"
22 SimulationServices = "RemoteSimulationConnectorModule"
19 LandServiceInConnector = true 23 LandServiceInConnector = true
24 NeighbourServiceInConnector = true
20 HypergridServiceInConnector = true 25 HypergridServiceInConnector = true
21 LLProxyLoginModule = true 26 SimulationServiceInConnector = true
27 InventoryServiceInConnector = false
28 AssetServiceInConnector = false
29 LibraryModule = false
30 LLLoginServiceInConnector = false
22 31
23[AssetService] 32[AssetService]
24 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 33 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -30,8 +39,8 @@
30 39
31[GridService] 40[GridService]
32 ; for the HGGridServicesConnector to instantiate 41 ; for the HGGridServicesConnector to instantiate
33 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" 42 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
34 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, 43 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
35 ; which in turn uses this 44 ; which in turn uses this
36 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
37 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 46 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"