Merged 0.1-prestable back into trunk :(

2 files changed, 50 insertions, 27 deletions

diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index bba6720..e64663d 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Data</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Data</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,22 +61,23 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

+    <Reference Include="System.Data">

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,6 +91,7 @@
     <Compile Include="SimProfileData.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="UserData.cs" />

     <Compile Include="UserProfileData.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -98,4 +106,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
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

 

     }

 }