aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-04 20:43:05 +0100
committerJustin Clark-Casey (justincc)2010-06-04 20:43:05 +0100
commit75878c8f43251477b3b10942b689d69c1e803056 (patch)
tree6baa8fa16d45e8c20768c4eff7dec3bb2c2cebd9 /OpenSim/Data
parentremove estate stuff in sqlite region migrations since this also exists in est... (diff)
downloadopensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.zip
opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.tar.gz
opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.tar.bz2
opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.tar.xz
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
additional tweaks to get this working properly
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/Null/NullAuthenticationData.cs3
-rw-r--r--OpenSim/Data/Null/NullUserAccountData.cs2
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Data/Null/NullAuthenticationData.cs b/OpenSim/Data/Null/NullAuthenticationData.cs
index 3fb3105..620deb9 100644
--- a/OpenSim/Data/Null/NullAuthenticationData.cs
+++ b/OpenSim/Data/Null/NullAuthenticationData.cs
@@ -76,6 +76,5 @@ namespace OpenSim.Data.Null
76 76
77 return false; 77 return false;
78 } 78 }
79
80 } 79 }
81} 80} \ No newline at end of file
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
index 9eb94e6..ede23fb 100644
--- a/OpenSim/Data/Null/NullUserAccountData.cs
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Data.Null
88 88
89 m_DataByUUID[data.PrincipalID] = data; 89 m_DataByUUID[data.PrincipalID] = data;
90 m_DataByName[data.FirstName + " " + data.LastName] = data; 90 m_DataByName[data.FirstName + " " + data.LastName] = data;
91 if (data.Data.ContainsKey("Email") && data.Data["Email"] != string.Empty) 91 if (data.Data.ContainsKey("Email") && data.Data["Email"] != null && data.Data["Email"] != string.Empty)
92 m_DataByEmail[data.Data["Email"]] = data; 92 m_DataByEmail[data.Data["Email"]] = data;
93 93
94 return true; 94 return true;