aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null
diff options
context:
space:
mode:
authorBlueWall2014-03-27 12:21:38 -0400
committerBlueWall2014-03-27 12:21:38 -0400
commita15282f023548ce6e1c6a728d913999ee120e9c1 (patch)
treeb33a39a66549521fe5782d87378b3b4209822e81 /OpenSim/Data/Null
parentFix issue with user picks creation. The snapshot id is UUID.Zero in new parcels. (diff)
parentLog errors in MakeRequest() as INFO, not ERROR. Some communications problems ... (diff)
downloadopensim-SC_OLD-a15282f023548ce6e1c6a728d913999ee120e9c1.zip
opensim-SC_OLD-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.gz
opensim-SC_OLD-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.bz2
opensim-SC_OLD-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.xz
Merge branch 'master' into m_test
Diffstat (limited to 'OpenSim/Data/Null')
-rwxr-xr-xOpenSim/Data/Null/NullEstateData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index 1df397d..57592f1 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Data.Null
42 42
43// private string m_connectionString; 43// private string m_connectionString;
44 44
45 private Dictionary<uint, EstateSettings> m_knownEstates = new Dictionary<uint, EstateSettings>(); 45// private Dictionary<uint, EstateSettings> m_knownEstates = new Dictionary<uint, EstateSettings>();
46 private EstateSettings m_estate = null; 46 private EstateSettings m_estate = null;
47 47
48 private EstateSettings GetEstate() 48 private EstateSettings GetEstate()