From 40c3ac4aeb77bfb317e35d711530d75adf62da4f Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sat, 12 Sep 2009 09:30:14 -0700
Subject: [PATCH] Guarding the unpacking of the email field introduced by
 Robsmart. Most profiles don't have it. This may fix mantis #4134.

---
 OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
index adc12aa0ef..01d6ec8ad5 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
@@ -651,7 +651,8 @@ namespace OpenSim.Region.Communications.OGS1
             UserProfileData userData = new UserProfileData();
             userData.FirstName = (string)data["firstname"];
             userData.SurName = (string)data["lastname"];
-            userData.Email = (string)data["email"];
+            if (data["email"] != null)
+                userData.Email = (string)data["email"];
             userData.ID = new UUID((string)data["uuid"]);
             userData.Created = Convert.ToInt32(data["profile_created"]);
             userData.UserInventoryURI = (string)data["server_inventory"];