aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorDiva Canto2009-12-11 20:20:18 -0800
committerDiva Canto2009-12-11 20:20:18 -0800
commit81debdfebe21bf7bd28a62dc3468151729d2e6c1 (patch)
tree143b94ef698298581aa32f490cbffd6f6fe98718 /OpenSim/Region/Communications
parentA couple of more sanity guards, but this won't fix things when user profile f... (diff)
downloadopensim-SC_OLD-81debdfebe21bf7bd28a62dc3468151729d2e6c1.zip
opensim-SC_OLD-81debdfebe21bf7bd28a62dc3468151729d2e6c1.tar.gz
opensim-SC_OLD-81debdfebe21bf7bd28a62dc3468151729d2e6c1.tar.bz2
opensim-SC_OLD-81debdfebe21bf7bd28a62dc3468151729d2e6c1.tar.xz
A few more guards along the path to user server.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs9
1 files changed, 6 insertions, 3 deletions
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
655 userData.Email = (string)data["email"]; 655 userData.Email = (string)data["email"];
656 userData.ID = new UUID((string)data["uuid"]); 656 userData.ID = new UUID((string)data["uuid"]);
657 userData.Created = Convert.ToInt32(data["profile_created"]); 657 userData.Created = Convert.ToInt32(data["profile_created"]);
658 userData.UserInventoryURI = (string)data["server_inventory"]; 658 if (data.Contains("server_inventory") && data["server_inventory"] != null)
659 userData.UserAssetURI = (string)data["server_asset"]; 659 userData.UserInventoryURI = (string)data["server_inventory"];
660 userData.FirstLifeAboutText = (string)data["profile_firstlife_about"]; 660 if (data.Contains("server_asset") && data["server_asset"] != null)
661 userData.UserAssetURI = (string)data["server_asset"];
662 if (data.Contains("profile_firstlife_about") && data["profile_firstlife_about"] != null)
663 userData.FirstLifeAboutText = (string)data["profile_firstlife_about"];
661 userData.FirstLifeImage = new UUID((string)data["profile_firstlife_image"]); 664 userData.FirstLifeImage = new UUID((string)data["profile_firstlife_image"]);
662 userData.CanDoMask = Convert.ToUInt32((string)data["profile_can_do"]); 665 userData.CanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
663 userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]); 666 userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);