From 75878c8f43251477b3b10942b689d69c1e803056 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Jun 2010 20:43:05 +0100
Subject: get TestSaveIarV0_1() working again by setting up an
 OpenSim.Data.Null.UserAuthenticationData plugin

additional tweaks to get this working properly
---
 OpenSim/Data/Null/NullAuthenticationData.cs | 3 +--
 OpenSim/Data/Null/NullUserAccountData.cs    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data')

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
 
             return false;
         }
-
     }
-}
+}
\ 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
 
             m_DataByUUID[data.PrincipalID] = data;
             m_DataByName[data.FirstName + " " + data.LastName] = data;
-            if (data.Data.ContainsKey("Email") && data.Data["Email"] != string.Empty)
+            if (data.Data.ContainsKey("Email") && data.Data["Email"] != null && data.Data["Email"] != string.Empty)
                 m_DataByEmail[data.Data["Email"]] = data;
 
             return true;
-- 
cgit v1.1