aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-09-12 09:30:14 -0700
committerDiva Canto2009-09-12 09:30:14 -0700
commit40c3ac4aeb77bfb317e35d711530d75adf62da4f (patch)
tree70f120e8788af12dc3348d00f1979634a8ba8ff1 /OpenSim
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-40c3ac4aeb77bfb317e35d711530d75adf62da4f.zip
opensim-SC_OLD-40c3ac4aeb77bfb317e35d711530d75adf62da4f.tar.gz
opensim-SC_OLD-40c3ac4aeb77bfb317e35d711530d75adf62da4f.tar.bz2
opensim-SC_OLD-40c3ac4aeb77bfb317e35d711530d75adf62da4f.tar.xz
Guarding the unpacking of the email field introduced by Robsmart. Most profiles don't have it. This may fix mantis #4134.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
index adc12aa..01d6ec8 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs
@@ -651,7 +651,8 @@ namespace OpenSim.Region.Communications.OGS1
651 UserProfileData userData = new UserProfileData(); 651 UserProfileData userData = new UserProfileData();
652 userData.FirstName = (string)data["firstname"]; 652 userData.FirstName = (string)data["firstname"];
653 userData.SurName = (string)data["lastname"]; 653 userData.SurName = (string)data["lastname"];
654 userData.Email = (string)data["email"]; 654 if (data["email"] != null)
655 userData.Email = (string)data["email"];
655 userData.ID = new UUID((string)data["uuid"]); 656 userData.ID = new UUID((string)data["uuid"]);
656 userData.Created = Convert.ToInt32(data["profile_created"]); 657 userData.Created = Convert.ToInt32(data["profile_created"]);
657 userData.UserInventoryURI = (string)data["server_inventory"]; 658 userData.UserInventoryURI = (string)data["server_inventory"];