diff options
| author | Melanie | 2011-04-17 18:42:06 +0200 |
|---|---|---|
| committer | Melanie | 2011-04-17 18:42:06 +0200 |
| commit | c02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch) | |
| tree | abb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Data | |
| parent | Fix the cert validation handler so that it will not block other parts of (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2 opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rwxr-xr-x | OpenSim/Data/Null/NullEstateData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs index 0cebff5..8db8064 100755 --- a/OpenSim/Data/Null/NullEstateData.cs +++ b/OpenSim/Data/Null/NullEstateData.cs | |||
| @@ -38,9 +38,9 @@ namespace OpenSim.Data.Null | |||
| 38 | { | 38 | { |
| 39 | public class NullEstateStore : IEstateDataStore | 39 | public class NullEstateStore : IEstateDataStore |
| 40 | { | 40 | { |
| 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 42 | 42 | ||
| 43 | private string m_connectionString; | 43 | // private string m_connectionString; |
| 44 | 44 | ||
| 45 | protected virtual Assembly Assembly | 45 | protected virtual Assembly Assembly |
| 46 | { | 46 | { |
| @@ -58,7 +58,7 @@ namespace OpenSim.Data.Null | |||
| 58 | 58 | ||
| 59 | public void Initialise(string connectionString) | 59 | public void Initialise(string connectionString) |
| 60 | { | 60 | { |
| 61 | m_connectionString = connectionString; | 61 | // m_connectionString = connectionString; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | private string[] FieldList | 64 | private string[] FieldList |