aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null
diff options
context:
space:
mode:
authorMelanie2011-10-11 21:30:42 +0100
committerMelanie2011-10-11 21:30:42 +0100
commit673886d2311ad9873f386ca794f5e1adf41755be (patch)
treea55c40204c3a351db5d2d86e6c3369ac71c40385 /OpenSim/Data/Null
parentMerge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge (diff)
parentReattaching a region was failing if the estate name had not changed (issue 50... (diff)
downloadopensim-SC_OLD-673886d2311ad9873f386ca794f5e1adf41755be.zip
opensim-SC_OLD-673886d2311ad9873f386ca794f5e1adf41755be.tar.gz
opensim-SC_OLD-673886d2311ad9873f386ca794f5e1adf41755be.tar.bz2
opensim-SC_OLD-673886d2311ad9873f386ca794f5e1adf41755be.tar.xz
Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge
Diffstat (limited to 'OpenSim/Data/Null')
-rwxr-xr-xOpenSim/Data/Null/NullEstateData.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index 8db8064..d64136d 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -84,6 +84,11 @@ namespace OpenSim.Data.Null
84 { 84 {
85 return new EstateSettings(); 85 return new EstateSettings();
86 } 86 }
87
88 public EstateSettings CreateNewEstate()
89 {
90 return new EstateSettings();
91 }
87 92
88 public List<EstateSettings> LoadEstateSettingsAll() 93 public List<EstateSettings> LoadEstateSettingsAll()
89 { 94 {