aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorDiva Canto2010-01-01 16:54:24 -0800
committerDiva Canto2010-01-01 16:54:24 -0800
commit4240f2dec6f7348a99aea0d1b040fca6ea9d493b (patch)
tree267b986654ab2ffbc3a60d3e95fd7b697f9b089c /OpenSim/Data
parentRemove the inner Md5 to let the auth service handle md5 passwords (diff)
downloadopensim-SC_OLD-4240f2dec6f7348a99aea0d1b040fca6ea9d493b.zip
opensim-SC_OLD-4240f2dec6f7348a99aea0d1b040fca6ea9d493b.tar.gz
opensim-SC_OLD-4240f2dec6f7348a99aea0d1b040fca6ea9d493b.tar.bz2
opensim-SC_OLD-4240f2dec6f7348a99aea0d1b040fca6ea9d493b.tar.xz
New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/Migration.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLPresenceData.cs6
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 5a9b01b..4622e23 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Data
128 return; 128 return;
129 129
130 // to prevent people from killing long migrations. 130 // to prevent people from killing long migrations.
131 m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision.", _type); 131 m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]);
132 m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!"); 132 m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!");
133 133
134 DbCommand cmd = _conn.CreateCommand(); 134 DbCommand cmd = _conn.CreateCommand();
@@ -144,7 +144,8 @@ namespace OpenSim.Data
144 } 144 }
145 catch (Exception e) 145 catch (Exception e)
146 { 146 {
147 m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing."); 147 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
148 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
148 } 149 }
149 150
150 if (version == 0) 151 if (version == 0)
@@ -253,7 +254,8 @@ namespace OpenSim.Data
253 if (m.Success) 254 if (m.Success)
254 { 255 {
255 int version = int.Parse(m.Groups[1].ToString()); 256 int version = int.Parse(m.Groups[1].ToString());
256 if (version > after) { 257 if (version > after)
258 {
257 using (Stream resource = _assem.GetManifestResourceStream(s)) 259 using (Stream resource = _assem.GetManifestResourceStream(s))
258 { 260 {
259 using (StreamReader resourceReader = new StreamReader(resource)) 261 using (StreamReader resourceReader = new StreamReader(resource))
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 72b8a0c..e5dd0e5 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -81,12 +81,12 @@ namespace OpenSim.Data.MySQL
81 81
82 MySqlCommand cmd = new MySqlCommand(); 82 MySqlCommand cmd = new MySqlCommand();
83 83
84 cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, Position=?Position, LookAt=?LookAt', Online='true' where `SessionID`=?SessionID", m_Realm); 84 cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, Position=?Position, LookAt=?LookAt, Online='true' where `SessionID`=?SessionID", m_Realm);
85 85
86 cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString()); 86 cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
87 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString()); 87 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
88 cmd.Parameters.AddWithValue("?Position", position); 88 cmd.Parameters.AddWithValue("?Position", position.ToString());
89 cmd.Parameters.AddWithValue("?LookAt", lookAt); 89 cmd.Parameters.AddWithValue("?LookAt", lookAt.ToString());
90 90
91 if (ExecuteNonQuery(cmd) == 0) 91 if (ExecuteNonQuery(cmd) == 0)
92 return false; 92 return false;