From 81debdfebe21bf7bd28a62dc3468151729d2e6c1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 11 Dec 2009 20:20:18 -0800
Subject: A few more guards along the path to user server.

---
 OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Communications')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
index 2f9a45f..776d5d1 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
@@ -655,9 +655,12 @@ namespace OpenSim.Region.Communications.OGS1
                 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"];
-            userData.UserAssetURI = (string)data["server_asset"];
-            userData.FirstLifeAboutText = (string)data["profile_firstlife_about"];
+            if (data.Contains("server_inventory") && data["server_inventory"] != null)
+                userData.UserInventoryURI = (string)data["server_inventory"];
+            if (data.Contains("server_asset") && data["server_asset"] != null)
+                userData.UserAssetURI = (string)data["server_asset"];
+            if (data.Contains("profile_firstlife_about") && data["profile_firstlife_about"] != null)
+                userData.FirstLifeAboutText = (string)data["profile_firstlife_about"];
             userData.FirstLifeImage = new UUID((string)data["profile_firstlife_image"]);
             userData.CanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
             userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
-- 
cgit v1.1