Merged 0.1-prestable back into trunk :(

1 files changed, 29 insertions, 14 deletions

diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGrid.Framework.Data/UserProfileData.cs
index d99394e..3a54828 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGrid.Framework.Data/UserProfileData.cs
@@ -7,27 +7,42 @@ namespace OpenGrid.Framework.Data
 {

     public class UserProfileData

     {

-        string username;    // The configurable part of the users username

-        string surname;     // The users surname (can be used to indicate user class - eg 'Test User' or 'Test Admin')

+        public LLUUID UUID;

+        public string username;    // The configurable part of the users username

+        public string surname;     // The users surname (can be used to indicate user class - eg 'Test User' or 'Test Admin')

 

-        ulong homeRegion;       // RegionHandle of home

-        LLVector3 homeLocation; // Home Location inside the sim

+        public string passwordHash; // Hash of the users password

 

-        int created;    // UNIX Epoch Timestamp (User Creation)

-        int lastLogin;  // UNIX Epoch Timestamp (Last Login Time)

+        public ulong homeRegion;       // RegionHandle of home

+        public LLVector3 homeLocation; // Home Location inside the sim

 

-        string userInventoryURI; // URI to inventory server for this user

-        string userAssetURI;     // URI to asset server for this user

+        public int created;    // UNIX Epoch Timestamp (User Creation)

+        public int lastLogin;  // UNIX Epoch Timestamp (Last Login Time)

 

-        uint profileCanDoMask; // Profile window "I can do" mask

-        uint profileWantDoMask; // Profile window "I want to" mask

+        public string userInventoryURI; // URI to inventory server for this user

+        public string userAssetURI;     // URI to asset server for this user

 

-        string profileAboutText; // My about window text

-        string profileFirstText; // First Life Text

+        public uint profileCanDoMask; // Profile window "I can do" mask

+        public uint profileWantDoMask; // Profile window "I want to" mask

 

-        LLUUID profileImage; // My avatars profile image

-        LLUUID profileFirstImage; // First-life image

+        public string profileAboutText; // My about window text

+        public string profileFirstText; // First Life Text

 

+        public LLUUID profileImage; // My avatars profile image

+        public LLUUID profileFirstImage; // First-life image

+        public UserAgentData currentAgent; // The users last agent

+    }

+

+    public class UserAgentData

+    {

+        public string agentIP;          // The IP of the agent

+        public uint agentPort;          // The port of the agent

+        public bool agentOnline;        // The online status of the agent

+        public LLUUID sessionID;        // The session ID for the agent

+        public LLUUID secureSessionID;  // The secure session ID for the agent

+        public LLUUID regionID;         // The region ID the agent occupies

+        public uint loginTime;          // EPOCH based Timestamp

+        public uint logoutTime;         // Timestamp or 0 if N/A

 

     }

 }