aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/GridConfig.cs7
-rw-r--r--OpenSim/Framework/UserConfig.cs12
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs7
-rw-r--r--OpenSim/Grid/GridServer/Program.cs14
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs3
5 files changed, 22 insertions, 21 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index e405b26..889f345 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Framework
42 public string DatabaseConnect = String.Empty; 42 public string DatabaseConnect = String.Empty;
43 public string DefaultAssetServer = String.Empty; 43 public string DefaultAssetServer = String.Empty;
44 public string DefaultUserServer = String.Empty; 44 public string DefaultUserServer = String.Empty;
45 public string GridOwner = String.Empty;
46 public uint HttpPort = DefaultHttpPort; 45 public uint HttpPort = DefaultHttpPort;
47 public string SimRecvKey = String.Empty; 46 public string SimRecvKey = String.Empty;
48 public string SimSendKey = String.Empty; 47 public string SimSendKey = String.Empty;
@@ -58,9 +57,6 @@ namespace OpenSim.Framework
58 57
59 public void loadConfigurationOptions() 58 public void loadConfigurationOptions()
60 { 59 {
61 configMember.addConfigurationOption("grid_owner",
62 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
63 "OGS Grid Owner", "OGS development team", false);
64 configMember.addConfigurationOption("default_asset_server", 60 configMember.addConfigurationOption("default_asset_server",
65 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 61 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
66 "Default Asset Server URI", 62 "Default Asset Server URI",
@@ -101,9 +97,6 @@ namespace OpenSim.Framework
101 { 97 {
102 switch (configuration_key) 98 switch (configuration_key)
103 { 99 {
104 case "grid_owner":
105 GridOwner = (string) configuration_result;
106 break;
107 case "default_asset_server": 100 case "default_asset_server":
108 DefaultAssetServer = (string) configuration_result; 101 DefaultAssetServer = (string) configuration_result;
109 break; 102 break;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index cb3365f..6cf526c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Framework
42 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
43 public uint DefaultX = 1000; 43 public uint DefaultX = 1000;
44 public uint DefaultY = 1000; 44 public uint DefaultY = 1000;
45 public string GridRecvKey = String.Empty;
46 public string GridSendKey = String.Empty;
45 public uint HttpPort = DefaultHttpPort; 47 public uint HttpPort = DefaultHttpPort;
46 public bool HttpSSL = DefaultHttpSSL; 48 public bool HttpSSL = DefaultHttpSSL;
47 49
@@ -96,6 +98,10 @@ namespace OpenSim.Framework
96 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 98 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
97 "Default Grid Server URI", 99 "Default Grid Server URI",
98 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false); 100 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false);
101 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
102 "Key to send to grid server", "null", false);
103 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
104 "Key to expect from grid server", "null", false);
99 105
100 configMember.addConfigurationOption("default_inventory_server", 106 configMember.addConfigurationOption("default_inventory_server",
101 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 107 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -129,6 +135,12 @@ namespace OpenSim.Framework
129 case "default_grid_server": 135 case "default_grid_server":
130 GridServerURL = new Uri( (string) configuration_result ); 136 GridServerURL = new Uri( (string) configuration_result );
131 break; 137 break;
138 case "grid_send_key":
139 GridSendKey = (string) configuration_result;
140 break;
141 case "grid_recv_key":
142 GridRecvKey = (string) configuration_result;
143 break;
132 case "default_inventory_server": 144 case "default_inventory_server":
133 InventoryUrl = new Uri((string) configuration_result); 145 InventoryUrl = new Uri((string) configuration_result);
134 break; 146 break;
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a8ebd27..d83027a 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.GridServer
77 { 77 {
78 base.Startup(); 78 base.Startup();
79 79
80 Config(); 80 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
81 81
82 SetupGridManager(); 82 SetupGridManager();
83 83
@@ -132,11 +132,6 @@ namespace OpenSim.Grid.GridServer
132 m_gridManager.Config = m_config; 132 m_gridManager.Config = m_config;
133 } 133 }
134 134
135 public void Config()
136 {
137 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
138 }
139
140 public void CheckSims(object sender, ElapsedEventArgs e) 135 public void CheckSims(object sender, ElapsedEventArgs e)
141 { 136 {
142 /* 137 /*
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 6eb4e15..8094906 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -39,15 +39,15 @@ namespace OpenSim.Grid.GridServer
39 39
40 GridServerBase app = new GridServerBase(); 40 GridServerBase app = new GridServerBase();
41 41
42 if (args.Length > 0 && args[0] == "-setuponly") 42// if (args.Length > 0 && args[0] == "-setuponly")
43 { 43// {
44 app.Config(); 44// app.Config();
45 } 45// }
46 else 46// else
47 { 47// {
48 app.Startup(); 48 app.Startup();
49 app.Work(); 49 app.Work();
50 } 50// }
51 } 51 }
52 } 52 }
53} 53}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 59af373..191e482 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -72,18 +72,19 @@ namespace OpenSim.Grid.UserServer
72 SimInfo = RegionProfileData.RequestSimProfileData( 72 SimInfo = RegionProfileData.RequestSimProfileData(
73 theUser.CurrentAgent.Handle, m_config.GridServerURL, 73 theUser.CurrentAgent.Handle, m_config.GridServerURL,
74 m_config.GridSendKey, m_config.GridRecvKey); 74 m_config.GridSendKey, m_config.GridRecvKey);
75
75 if (SimInfo == null) 76 if (SimInfo == null)
76 { 77 {
77 m_log.Error("[GRID]: Region user was in isn't currently logged in"); 78 m_log.Error("[GRID]: Region user was in isn't currently logged in");
78 return; 79 return;
79 } 80 }
80
81 } 81 }
82 catch (Exception) 82 catch (Exception)
83 { 83 {
84 m_log.Error("[GRID]: Unable to look up region to log user off"); 84 m_log.Error("[GRID]: Unable to look up region to log user off");
85 return; 85 return;
86 } 86 }
87
87 // Prepare notification 88 // Prepare notification
88 Hashtable SimParams = new Hashtable(); 89 Hashtable SimParams = new Hashtable();
89 SimParams["agent_id"] = theUser.ID.ToString(); 90 SimParams["agent_id"] = theUser.ID.ToString();