aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null/NullUserAccountData.cs
diff options
context:
space:
mode:
authorMelanie2010-06-04 21:11:15 +0100
committerMelanie2010-06-04 21:11:15 +0100
commitc5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Data/Null/NullUserAccountData.cs
parentChange the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parentbring TestLoadIarV0_1AbsentUsers() back online (diff)
downloadopensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.zip
opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz
opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2
opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Null/NullUserAccountData.cs2
1 files changed, 1 insertions, 1 deletions
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;