aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-01-10 10:40:07 -0800
committerDiva Canto2010-01-10 10:40:07 -0800
commit1e1b2ab221851efc414678b7ea52ef2ca788ce9f (patch)
tree29b6aa80e54a9c18529ae14e7d185fe67582d151 /OpenSim/Framework
parentAdd a "LockedOut" flag to allow locking a region out via the grid server. (diff)
downloadopensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.zip
opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.gz
opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.bz2
opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.xz
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here * Compiles. Untested.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Serialization/External/UserProfileSerializer.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index fb269b7..de106b2 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -29,6 +29,7 @@ using System.IO;
29using System.Xml; 29using System.Xml;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Services.Interfaces;
32 33
33namespace OpenSim.Framework.Serialization.External 34namespace OpenSim.Framework.Serialization.External
34{ 35{
@@ -40,7 +41,7 @@ namespace OpenSim.Framework.Serialization.External
40 public const int MAJOR_VERSION = 0; 41 public const int MAJOR_VERSION = 0;
41 public const int MINOR_VERSION = 1; 42 public const int MINOR_VERSION = 1;
42 43
43 public static string Serialize(UserProfileData profile) 44 public static string Serialize(UserAccount profile)
44 { 45 {
45 StringWriter sw = new StringWriter(); 46 StringWriter sw = new StringWriter();
46 XmlTextWriter xtw = new XmlTextWriter(sw); 47 XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -51,9 +52,9 @@ namespace OpenSim.Framework.Serialization.External
51 xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString()); 52 xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString());
52 xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString()); 53 xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString());
53 54
54 xtw.WriteElementString("name", profile.Name); 55 xtw.WriteElementString("name", profile.FirstName + " " + profile.LastName);
55 xtw.WriteElementString("id", profile.ID.ToString()); 56 xtw.WriteElementString("id", profile.PrincipalID.ToString());
56 xtw.WriteElementString("about", profile.AboutText); 57 xtw.WriteElementString("about", "");
57 58
58 // Not sure if we're storing this yet, need to take a look 59 // Not sure if we're storing this yet, need to take a look
59// xtw.WriteElementString("Url", profile.Url); 60// xtw.WriteElementString("Url", profile.Url);