aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorTleiades Hax2007-10-17 09:36:11 +0000
committerTleiades Hax2007-10-17 09:36:11 +0000
commit44a7db0e44d175fcb854b7bfd11d3b97ed6b934c (patch)
tree52f6853eb180fbdd998c2019a136c7bdfa03dec4 /OpenSim/Grid
parentthis might help with ODE errors. Or maybe not. YMMV (diff)
downloadopensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.zip
opensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.tar.gz
opensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.tar.bz2
opensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.tar.xz
Renamed SimProfileData to RegionProfileData
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs40
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
2 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 64e8e4b..81197fd 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Grid.GridServer
122 /// </summary> 122 /// </summary>
123 /// <param name="uuid">A UUID key of the region to return</param> 123 /// <param name="uuid">A UUID key of the region to return</param>
124 /// <returns>A SimProfileData for the region</returns> 124 /// <returns>A SimProfileData for the region</returns>
125 public SimProfileData getRegion(LLUUID uuid) 125 public RegionProfileData getRegion(LLUUID uuid)
126 { 126 {
127 foreach(KeyValuePair<string,IGridData> kvp in _plugins) { 127 foreach(KeyValuePair<string,IGridData> kvp in _plugins) {
128 try 128 try
@@ -142,7 +142,7 @@ namespace OpenSim.Grid.GridServer
142 /// </summary> 142 /// </summary>
143 /// <param name="uuid">A regionHandle of the region to return</param> 143 /// <param name="uuid">A regionHandle of the region to return</param>
144 /// <returns>A SimProfileData for the region</returns> 144 /// <returns>A SimProfileData for the region</returns>
145 public SimProfileData getRegion(ulong handle) 145 public RegionProfileData getRegion(ulong handle)
146 { 146 {
147 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 147 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
148 { 148 {
@@ -158,16 +158,16 @@ namespace OpenSim.Grid.GridServer
158 return null; 158 return null;
159 } 159 }
160 160
161 public Dictionary<ulong, SimProfileData> getRegions(uint xmin, uint ymin, uint xmax, uint ymax) 161 public Dictionary<ulong, RegionProfileData> getRegions(uint xmin, uint ymin, uint xmax, uint ymax)
162 { 162 {
163 Dictionary<ulong, SimProfileData> regions = new Dictionary<ulong, SimProfileData>(); 163 Dictionary<ulong, RegionProfileData> regions = new Dictionary<ulong, RegionProfileData>();
164 164
165 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 165 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
166 { 166 {
167 try 167 try
168 { 168 {
169 SimProfileData[] neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax); 169 RegionProfileData[] neighbours = kvp.Value.GetProfilesInRange(xmin, ymin, xmax, ymax);
170 foreach (SimProfileData neighbour in neighbours) 170 foreach (RegionProfileData neighbour in neighbours)
171 { 171 {
172 regions[neighbour.regionHandle] = neighbour; 172 regions[neighbour.regionHandle] = neighbour;
173 } 173 }
@@ -191,8 +191,8 @@ namespace OpenSim.Grid.GridServer
191 public string GetXMLNeighbours(ulong reqhandle) 191 public string GetXMLNeighbours(ulong reqhandle)
192 { 192 {
193 string response = ""; 193 string response = "";
194 SimProfileData central_region = getRegion(reqhandle); 194 RegionProfileData central_region = getRegion(reqhandle);
195 SimProfileData neighbour; 195 RegionProfileData neighbour;
196 for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++) 196 for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
197 { 197 {
198 if (getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256)) != null) 198 if (getRegion(Util.UIntsToLong((uint)((central_region.regionLocX + x) * 256), (uint)(central_region.regionLocY + y) * 256)) != null)
@@ -223,7 +223,7 @@ namespace OpenSim.Grid.GridServer
223 Hashtable responseData = new Hashtable(); 223 Hashtable responseData = new Hashtable();
224 response.Value = responseData; 224 response.Value = responseData;
225 225
226 SimProfileData TheSim = null; 226 RegionProfileData TheSim = null;
227 Hashtable requestData = (Hashtable)request.Params[0]; 227 Hashtable requestData = (Hashtable)request.Params[0];
228 string myword; 228 string myword;
229 if (requestData.ContainsKey("UUID")) 229 if (requestData.ContainsKey("UUID"))
@@ -254,7 +254,7 @@ namespace OpenSim.Grid.GridServer
254 myword = "connection"; 254 myword = "connection";
255 } 255 }
256 256
257 TheSim = new SimProfileData(); 257 TheSim = new RegionProfileData();
258 258
259 TheSim.regionRecvKey = config.SimRecvKey; 259 TheSim.regionRecvKey = config.SimRecvKey;
260 TheSim.regionSendKey = config.SimSendKey; 260 TheSim.regionSendKey = config.SimSendKey;
@@ -325,16 +325,16 @@ namespace OpenSim.Grid.GridServer
325 325
326 ArrayList SimNeighboursData = new ArrayList(); 326 ArrayList SimNeighboursData = new ArrayList();
327 327
328 SimProfileData neighbour; 328 RegionProfileData neighbour;
329 Hashtable NeighbourBlock; 329 Hashtable NeighbourBlock;
330 330
331 bool fastMode = false; // Only compatible with MySQL right now 331 bool fastMode = false; // Only compatible with MySQL right now
332 332
333 if (fastMode) 333 if (fastMode)
334 { 334 {
335 Dictionary<ulong, SimProfileData> neighbours = getRegions(TheSim.regionLocX - 1, TheSim.regionLocY - 1, TheSim.regionLocX + 1, TheSim.regionLocY + 1); 335 Dictionary<ulong, RegionProfileData> neighbours = getRegions(TheSim.regionLocX - 1, TheSim.regionLocY - 1, TheSim.regionLocX + 1, TheSim.regionLocY + 1);
336 336
337 foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) 337 foreach (KeyValuePair<ulong, RegionProfileData> aSim in neighbours)
338 { 338 {
339 NeighbourBlock = new Hashtable(); 339 NeighbourBlock = new Hashtable();
340 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.Value.serverIP.ToString()).ToString(); 340 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.Value.serverIP.ToString()).ToString();
@@ -395,7 +395,7 @@ namespace OpenSim.Grid.GridServer
395 { 395 {
396 Hashtable requestData = (Hashtable)request.Params[0]; 396 Hashtable requestData = (Hashtable)request.Params[0];
397 Hashtable responseData = new Hashtable(); 397 Hashtable responseData = new Hashtable();
398 SimProfileData simData = null; 398 RegionProfileData simData = null;
399 if (requestData.ContainsKey("region_UUID")) 399 if (requestData.ContainsKey("region_UUID"))
400 { 400 {
401 simData = getRegion(new LLUUID((string)requestData["region_UUID"])); 401 simData = getRegion(new LLUUID((string)requestData["region_UUID"]));
@@ -461,9 +461,9 @@ namespace OpenSim.Grid.GridServer
461 461
462 if (fastMode) 462 if (fastMode)
463 { 463 {
464 Dictionary<ulong, SimProfileData> neighbours = getRegions((uint)xmin, (uint)ymin, (uint)xmax, (uint)ymax); 464 Dictionary<ulong, RegionProfileData> neighbours = getRegions((uint)xmin, (uint)ymin, (uint)xmax, (uint)ymax);
465 465
466 foreach (KeyValuePair<ulong, SimProfileData> aSim in neighbours) 466 foreach (KeyValuePair<ulong, RegionProfileData> aSim in neighbours)
467 { 467 {
468 Hashtable simProfileBlock = new Hashtable(); 468 Hashtable simProfileBlock = new Hashtable();
469 simProfileBlock["x"] = aSim.Value.regionLocX.ToString(); 469 simProfileBlock["x"] = aSim.Value.regionLocX.ToString();
@@ -489,7 +489,7 @@ namespace OpenSim.Grid.GridServer
489 } 489 }
490 else 490 else
491 { 491 {
492 SimProfileData simProfile; 492 RegionProfileData simProfile;
493 for (int x = xmin; x < xmax+1; x++) 493 for (int x = xmin; x < xmax+1; x++)
494 { 494 {
495 for (int y = ymin; y < ymax+1; y++) 495 for (int y = ymin; y < ymax+1; y++)
@@ -564,7 +564,7 @@ namespace OpenSim.Grid.GridServer
564 { 564 {
565 string respstring = String.Empty; 565 string respstring = String.Empty;
566 566
567 SimProfileData TheSim; 567 RegionProfileData TheSim;
568 LLUUID UUID = new LLUUID(param); 568 LLUUID UUID = new LLUUID(param);
569 TheSim = getRegion(UUID); 569 TheSim = getRegion(UUID);
570 570
@@ -598,11 +598,11 @@ namespace OpenSim.Grid.GridServer
598 public string RestSetSimMethod(string request, string path, string param) 598 public string RestSetSimMethod(string request, string path, string param)
599 { 599 {
600 Console.WriteLine("Processing region update via REST method"); 600 Console.WriteLine("Processing region update via REST method");
601 SimProfileData TheSim; 601 RegionProfileData TheSim;
602 TheSim = getRegion(new LLUUID(param)); 602 TheSim = getRegion(new LLUUID(param));
603 if ((TheSim) == null) 603 if ((TheSim) == null)
604 { 604 {
605 TheSim = new SimProfileData(); 605 TheSim = new RegionProfileData();
606 LLUUID UUID = new LLUUID(param); 606 LLUUID UUID = new LLUUID(param);
607 TheSim.UUID = UUID; 607 TheSim.UUID = UUID;
608 TheSim.regionRecvKey = config.SimRecvKey; 608 TheSim.regionRecvKey = config.SimRecvKey;
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 8f89727..10a8974 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -56,8 +56,8 @@ namespace OpenSim.Grid.UserServer
56 /// <param name="theUser">The user profile</param> 56 /// <param name="theUser">The user profile</param>
57 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) 57 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
58 { 58 {
59 // Load information from the gridserver 59 // Load information from the gridserver
60 SimProfileData SimInfo = new SimProfileData(); 60 RegionProfileData SimInfo = new RegionProfileData();
61 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); 61 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
62 62
63 // Customise the response 63 // Customise the response