aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-14 13:23:02 +0000
committerMelanie Thielker2008-09-14 13:23:02 +0000
commit281955949910eb257b5f7e42e54535ba7812418e (patch)
tree8c62c0006f2567983a686e811513c8c009061aac /OpenSim/Grid/GridServer
parent* Converted a number of methods within the login processes from private to pr... (diff)
downloadopensim-SC_OLD-281955949910eb257b5f7e42e54535ba7812418e.zip
opensim-SC_OLD-281955949910eb257b5f7e42e54535ba7812418e.tar.gz
opensim-SC_OLD-281955949910eb257b5f7e42e54535ba7812418e.tar.bz2
opensim-SC_OLD-281955949910eb257b5f7e42e54535ba7812418e.tar.xz
Mantis #2124
Thank you, RuudL, for a patch that brings MSSQL up to the same implementation level as MySQL.
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 2e0767e..b437f59 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -136,8 +136,9 @@ namespace OpenSim.Grid.GridServer
136 { 136 {
137 return plugin.GetProfileByHandle(handle); 137 return plugin.GetProfileByHandle(handle);
138 } 138 }
139 catch 139 catch (Exception ex)
140 { 140 {
141 m_log.Debug("[storage]: " + ex.Message);
141 m_log.Warn("[storage]: Unable to find region " + handle.ToString() + " via " + plugin.Name); 142 m_log.Warn("[storage]: Unable to find region " + handle.ToString() + " via " + plugin.Name);
142 } 143 }
143 } 144 }
@@ -500,14 +501,11 @@ namespace OpenSim.Grid.GridServer
500 RegionProfileData neighbour; 501 RegionProfileData neighbour;
501 Hashtable NeighbourBlock; 502 Hashtable NeighbourBlock;
502 503
503 bool fastMode = false; // Only compatible with MySQL right now 504 //First use the fast method. (not implemented in SQLLite)
505 Dictionary<ulong, RegionProfileData> neighbours = GetRegions(sim.regionLocX - 1, sim.regionLocY - 1, sim.regionLocX + 1, sim.regionLocY + 1);
504 506
505 if (fastMode) 507 if (neighbours.Count > 0)
506 { 508 {
507 Dictionary<ulong, RegionProfileData> neighbours =
508 GetRegions(sim.regionLocX - 1, sim.regionLocY - 1, sim.regionLocX + 1,
509 sim.regionLocY + 1);
510
511 foreach (KeyValuePair<ulong, RegionProfileData> aSim in neighbours) 509 foreach (KeyValuePair<ulong, RegionProfileData> aSim in neighbours)
512 { 510 {
513 NeighbourBlock = new Hashtable(); 511 NeighbourBlock = new Hashtable();
@@ -657,8 +655,7 @@ namespace OpenSim.Grid.GridServer
657 //TheSim = GetRegion(new UUID((string) requestData["UUID"])); 655 //TheSim = GetRegion(new UUID((string) requestData["UUID"]));
658 uuid = requestData["UUID"].ToString(); 656 uuid = requestData["UUID"].ToString();
659 m_log.InfoFormat("[LOGOUT]: Logging out region: {0}", uuid); 657 m_log.InfoFormat("[LOGOUT]: Logging out region: {0}", uuid);
660 658// logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcDeleteRegionMethod","", 5,"Attempting delete with UUID.");
661 // logToDB((new UUID((string)requestData["UUID"])).ToString(),"XmlRpcDeleteRegionMethod","", 5,"Attempting delete with UUID.");
662 } 659 }
663 else 660 else
664 { 661 {
@@ -671,9 +668,12 @@ namespace OpenSim.Grid.GridServer
671 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData(); 668 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
672 try 669 try
673 { 670 {
674 MySQLGridData mysqldata = (MySQLGridData)(plugin); 671 //Nice are we not using multiple databases?
672 //MySQLGridData mysqldata = (MySQLGridData)(plugin);
673
675 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); 674 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
676 DataResponse insertResponse = mysqldata.DeleteProfile(uuid); 675 DataResponse insertResponse = plugin.DeleteProfile(uuid);
676
677 switch (insertResponse) 677 switch (insertResponse)
678 { 678 {
679 case DataResponse.RESPONSE_OK: 679 case DataResponse.RESPONSE_OK:
@@ -696,7 +696,7 @@ namespace OpenSim.Grid.GridServer
696 } 696 }
697 catch (Exception) 697 catch (Exception)
698 { 698 {
699 m_log.Error("storage Unable to delete region " + uuid + " via MySQL"); 699 m_log.Error("storage Unable to delete region " + uuid + " via " + plugin.Name);
700 //MainLog.Instance.Warn("storage", e.ToString()); 700 //MainLog.Instance.Warn("storage", e.ToString());
701 } 701 }
702 } 702 }