diff options
| author | Melanie | 2009-12-12 04:14:12 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-12 04:14:12 +0000 |
| commit | 83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f (patch) | |
| tree | a3b7f1def00f4365254b3e5c3c6eebd0a0c6c7a9 /OpenSim/Region/Communications | |
| parent | Getting rid of a bunch of old classes, that are likely left over from the ROB... (diff) | |
| parent | A few more guards along the path to user server. (diff) | |
| download | opensim-SC-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.zip opensim-SC-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.tar.gz opensim-SC-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.tar.bz2 opensim-SC-83ca7db4b85641b8bfbfeab6cb9b1c3157fcf67f.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Communications')
| -rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | 9 |
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"]); |