diff options
author | mingchen | 2007-07-03 19:26:35 +0000 |
---|---|---|
committer | mingchen | 2007-07-03 19:26:35 +0000 |
commit | 78e420f48bc8ce79f45c5a90d8ebb4004d7993e7 (patch) | |
tree | f48c150972b59371371b69a49ea4991e1cbafac3 /OpenSim/Grid/GridServer/GridManager.cs | |
parent | *Removed GridInfo class as it has been previously replaced with the much bett... (diff) | |
download | opensim-SC-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.zip opensim-SC-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.tar.gz opensim-SC-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.tar.bz2 opensim-SC-78e420f48bc8ce79f45c5a90d8ebb4004d7993e7.tar.xz |
*Fixed storage issue as noted in last commit of the OGS1 GridServer
*Reverted the default remote grid server port back to 8001 (from a port change to debug a previous issue)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 816c9fd..4c60852 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -126,9 +126,9 @@ namespace OpenSim.Grid.GridServer | |||
126 | { | 126 | { |
127 | return kvp.Value.GetProfileByLLUUID(uuid); | 127 | return kvp.Value.GetProfileByLLUUID(uuid); |
128 | } | 128 | } |
129 | catch (Exception) | 129 | catch (Exception e) |
130 | { | 130 | { |
131 | MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); | 131 | MainLog.Instance.Warn("Message from Storage: " + e.Message); |
132 | } | 132 | } |
133 | } | 133 | } |
134 | return null; | 134 | return null; |
@@ -225,10 +225,10 @@ namespace OpenSim.Grid.GridServer | |||
225 | SimProfileData TheSim = null; | 225 | SimProfileData TheSim = null; |
226 | Hashtable requestData = (Hashtable)request.Params[0]; | 226 | Hashtable requestData = (Hashtable)request.Params[0]; |
227 | 227 | ||
228 | Console.WriteLine(requestData.ToString()); | ||
229 | if (requestData.ContainsKey("UUID")) | 228 | if (requestData.ContainsKey("UUID")) |
230 | { | 229 | { |
231 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); | 230 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); |
231 | |||
232 | logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); | 232 | logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); |
233 | } | 233 | } |
234 | else if (requestData.ContainsKey("region_handle")) | 234 | else if (requestData.ContainsKey("region_handle")) |
@@ -269,6 +269,7 @@ namespace OpenSim.Grid.GridServer | |||
269 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; | 269 | TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; |
270 | 270 | ||
271 | TheSim.regionName = (string)requestData["sim_name"]; | 271 | TheSim.regionName = (string)requestData["sim_name"]; |
272 | TheSim.UUID = new LLUUID((string)requestData["UUID"]); | ||
272 | 273 | ||
273 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | 274 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) |
274 | { | 275 | { |