diff options
| author | Melanie | 2010-03-02 04:43:36 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-02 04:46:13 +0000 |
| commit | bef311dfb9692ffefcafa5752e6da4d0823c8773 (patch) | |
| tree | 56efb8190b32ad9b80eef9b15990ef44920d338e /OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |
| parent | Changed the query in GetFriends in SQLite to match the one in MySql. (diff) | |
| parent | Fix a few compiler warnings. (diff) | |
| download | opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.zip opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.gz opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.bz2 opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.xz | |
Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLGenericTableHandler.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 6ad59f6..b170dde 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
| @@ -39,10 +39,6 @@ namespace OpenSim.Data.MySQL | |||
| 39 | { | 39 | { |
| 40 | public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new() | 40 | public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new() |
| 41 | { | 41 | { |
| 42 | private static readonly ILog m_log = | ||
| 43 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
| 44 | |||
| 45 | |||
| 46 | protected Dictionary<string, FieldInfo> m_Fields = | 42 | protected Dictionary<string, FieldInfo> m_Fields = |
| 47 | new Dictionary<string, FieldInfo>(); | 43 | new Dictionary<string, FieldInfo>(); |
| 48 | 44 | ||