diff options
author | Melanie | 2009-11-19 17:53:34 +0000 |
---|---|---|
committer | Melanie | 2009-11-19 17:53:34 +0000 |
commit | d179f2cce970a6f54ce498e2ae3321b9ece417de (patch) | |
tree | 12094c66474d39e1f6fb725a41abc02145d56226 /OpenSim/Data | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: tweak log message to say which region is being enabled for logins (diff) | |
download | opensim-SC-d179f2cce970a6f54ce498e2ae3321b9ece417de.zip opensim-SC-d179f2cce970a6f54ce498e2ae3321b9ece417de.tar.gz opensim-SC-d179f2cce970a6f54ce498e2ae3321b9ece417de.tar.bz2 opensim-SC-d179f2cce970a6f54ce498e2ae3321b9ece417de.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/IPresenceData.cs | 7 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 19 |
2 files changed, 21 insertions, 5 deletions
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs index 891b590..e5a8ebd 100644 --- a/OpenSim/Data/IPresenceData.cs +++ b/OpenSim/Data/IPresenceData.cs | |||
@@ -32,11 +32,11 @@ using OpenSim.Framework; | |||
32 | 32 | ||
33 | namespace OpenSim.Data | 33 | namespace OpenSim.Data |
34 | { | 34 | { |
35 | public class PresenceData | 35 | public struct PresenceData |
36 | { | 36 | { |
37 | public UUID UUID; | 37 | public UUID UUID; |
38 | public UUID currentRegion; | 38 | public UUID currentRegion; |
39 | public Dictionary<string, object> Data; | 39 | public Dictionary<string, string> Data; |
40 | } | 40 | } |
41 | 41 | ||
42 | /// <summary> | 42 | /// <summary> |
@@ -48,7 +48,8 @@ namespace OpenSim.Data | |||
48 | 48 | ||
49 | PresenceData Get(UUID principalID); | 49 | PresenceData Get(UUID principalID); |
50 | 50 | ||
51 | bool SetDataItem(UUID principalID, string item, string value); | 51 | bool SetUserDataItem(UUID principalID, string item, string value); |
52 | bool SetRegionDataItem(UUID principalID, string item, string value); | ||
52 | 53 | ||
53 | bool Delete(UUID regionID); | 54 | bool Delete(UUID regionID); |
54 | } | 55 | } |
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 4eb4a24..4e27e26 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Data.MySQL | |||
112 | for (int i = 0 ; i < fields.Length ; i++) | 112 | for (int i = 0 ; i < fields.Length ; i++) |
113 | { | 113 | { |
114 | cmd.Parameters.AddWithValue(fields[i], keys[i]); | 114 | cmd.Parameters.AddWithValue(fields[i], keys[i]); |
115 | terms.Add(fields[i] + " = ?" + fields[i]); | 115 | terms.Add("`" + fields[i] + "` = ?" + fields[i]); |
116 | } | 116 | } |
117 | 117 | ||
118 | string where = String.Join(" and ", terms.ToArray()); | 118 | string where = String.Join(" and ", terms.ToArray()); |
@@ -190,11 +190,26 @@ namespace OpenSim.Data.MySQL | |||
190 | return DoQuery(cmd); | 190 | return DoQuery(cmd); |
191 | } | 191 | } |
192 | 192 | ||
193 | public void Store(T row) | 193 | public bool Store(T row) |
194 | { | 194 | { |
195 | MySqlCommand cmd = new MySqlCommand(); | 195 | MySqlCommand cmd = new MySqlCommand(); |
196 | 196 | ||
197 | string query = ""; | 197 | string query = ""; |
198 | |||
199 | return false; | ||
200 | } | ||
201 | |||
202 | public bool Delete(string field, string val) | ||
203 | { | ||
204 | MySqlCommand cmd = new MySqlCommand(); | ||
205 | |||
206 | cmd.CommandText = String.Format("delete from {0} where `{1}` = ?{1}", m_Realm, field); | ||
207 | cmd.Parameters.AddWithValue(field, val); | ||
208 | |||
209 | if (ExecuteNonQuery(cmd) > 0) | ||
210 | return true; | ||
211 | |||
212 | return false; | ||
198 | } | 213 | } |
199 | } | 214 | } |
200 | } | 215 | } |