diff options
author | Melanie | 2011-04-17 18:48:53 +0100 |
---|---|---|
committer | Melanie | 2011-04-17 18:48:53 +0100 |
commit | 474910c9d624b53c010232ddb32b4002f58f1de0 (patch) | |
tree | 45ddab37c6afa0b095ffa0503640b9fe235bc400 /OpenSim/Data | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | More descriptive debug msg for ServiceOSDRequest failures. (diff) | |
download | opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.zip opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.gz opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.bz2 opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.xz |
Merge branch 'master' 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 |