diff options
| author | BlueWall | 2014-03-27 12:21:38 -0400 |
|---|---|---|
| committer | BlueWall | 2014-03-27 12:21:38 -0400 |
| commit | a15282f023548ce6e1c6a728d913999ee120e9c1 (patch) | |
| tree | b33a39a66549521fe5782d87378b3b4209822e81 /OpenSim/Data/Null | |
| parent | Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels. (diff) | |
| parent | Log errors in MakeRequest() as INFO, not ERROR. Some communications problems ... (diff) | |
| download | opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.zip opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.gz opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.bz2 opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.xz | |
Merge branch 'master' into m_test
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Data/Null/NullEstateData.cs | 2 |
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() |