diff options
| author | Melanie | 2009-09-27 21:25:10 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-27 21:25:10 +0100 |
| commit | b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30 (patch) | |
| tree | b7e6844d7f037541640e489d3c8bec53159b5df0 /OpenSim/Data/MySQL/MySQLUserAccountData.cs | |
| parent | Add the Migration for the regions table (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.zip opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.gz opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.bz2 opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLUserAccountData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs index 39d60ca..5352727 100644 --- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs +++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs | |||
| @@ -39,7 +39,7 @@ namespace OpenSim.Data.MySQL | |||
| 39 | { | 39 | { |
| 40 | private string m_Realm; | 40 | private string m_Realm; |
| 41 | private List<string> m_ColumnNames = null; | 41 | private List<string> m_ColumnNames = null; |
| 42 | private int m_LastExpire = 0; | 42 | // private int m_LastExpire = 0; |
| 43 | 43 | ||
| 44 | public MySqlUserAccountData(string connectionString, string realm) | 44 | public MySqlUserAccountData(string connectionString, string realm) |
| 45 | : base(connectionString) | 45 | : base(connectionString) |