aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGrid.Framework.Data
diff options
context:
space:
mode:
authorAdam Frisby2007-05-13 14:59:24 +0000
committerAdam Frisby2007-05-13 14:59:24 +0000
commitb1101797307504cfc2eea6317d4c4dc2b5964480 (patch)
tree35d7ec88ff9ce0171260ba7166bc6cb3c1fcbb4d /OpenGrid.Framework.Data
parentInventory should be working again in sandbox mode (diff)
downloadopensim-SC-b1101797307504cfc2eea6317d4c4dc2b5964480.zip
opensim-SC-b1101797307504cfc2eea6317d4c4dc2b5964480.tar.gz
opensim-SC-b1101797307504cfc2eea6317d4c4dc2b5964480.tar.bz2
opensim-SC-b1101797307504cfc2eea6317d4c4dc2b5964480.tar.xz
* Fixed MySQL Grid Manager
* Added preliminary support for DB UserServer (incomplete) * Added better handling of defaults to Grid Manager. * Renamed SQL/regions.sql to SQL/mysql-regions.sql.
Diffstat (limited to 'OpenGrid.Framework.Data')
-rw-r--r--OpenGrid.Framework.Data/SimProfileData.cs26
-rw-r--r--OpenGrid.Framework.Data/UserProfileData.cs2
2 files changed, 15 insertions, 13 deletions
diff --git a/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGrid.Framework.Data/SimProfileData.cs
index d5a5392..f86fb95 100644
--- a/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenGrid.Framework.Data/SimProfileData.cs
@@ -9,7 +9,7 @@ namespace OpenGrid.Framework.Data
9 /// <summary> 9 /// <summary>
10 /// The name of the region 10 /// The name of the region
11 /// </summary> 11 /// </summary>
12 public string regionName; 12 public string regionName = "";
13 13
14 /// <summary> 14 /// <summary>
15 /// A 64-bit number combining map position into a (mostly) unique ID 15 /// A 64-bit number combining map position into a (mostly) unique ID
@@ -32,9 +32,9 @@ namespace OpenGrid.Framework.Data
32 /// Authentication secrets 32 /// Authentication secrets
33 /// </summary> 33 /// </summary>
34 /// <remarks>Not very secure, needs improvement.</remarks> 34 /// <remarks>Not very secure, needs improvement.</remarks>
35 public string regionSendKey; 35 public string regionSendKey = "";
36 public string regionRecvKey; 36 public string regionRecvKey = "";
37 public string regionSecret; 37 public string regionSecret = "";
38 38
39 /// <summary> 39 /// <summary>
40 /// Whether the region is online 40 /// Whether the region is online
@@ -44,9 +44,9 @@ namespace OpenGrid.Framework.Data
44 /// <summary> 44 /// <summary>
45 /// Information about the server that the region is currently hosted on 45 /// Information about the server that the region is currently hosted on
46 /// </summary> 46 /// </summary>
47 public string serverIP; 47 public string serverIP = "";
48 public uint serverPort; 48 public uint serverPort;
49 public string serverURI; 49 public string serverURI = "";
50 50
51 /// <summary> 51 /// <summary>
52 /// Set of optional overrides. Can be used to create non-eulicidean spaces. 52 /// Set of optional overrides. Can be used to create non-eulicidean spaces.
@@ -60,20 +60,20 @@ namespace OpenGrid.Framework.Data
60 /// Optional: URI Location of the region database 60 /// Optional: URI Location of the region database
61 /// </summary> 61 /// </summary>
62 /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks> 62 /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
63 public string regionDataURI; 63 public string regionDataURI = "";
64 64
65 /// <summary> 65 /// <summary>
66 /// Region Asset Details 66 /// Region Asset Details
67 /// </summary> 67 /// </summary>
68 public string regionAssetURI; 68 public string regionAssetURI = "";
69 public string regionAssetSendKey; 69 public string regionAssetSendKey = "";
70 public string regionAssetRecvKey; 70 public string regionAssetRecvKey = "";
71 71
72 /// <summary> 72 /// <summary>
73 /// Region Userserver Details 73 /// Region Userserver Details
74 /// </summary> 74 /// </summary>
75 public string regionUserURI; 75 public string regionUserURI = "";
76 public string regionUserSendKey; 76 public string regionUserSendKey = "";
77 public string regionUserRecvKey; 77 public string regionUserRecvKey = "";
78 } 78 }
79} 79}
diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGrid.Framework.Data/UserProfileData.cs
index 3a54828..8d72c6b 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGrid.Framework.Data/UserProfileData.cs
@@ -15,6 +15,8 @@ namespace OpenGrid.Framework.Data
15 15
16 public ulong homeRegion; // RegionHandle of home 16 public ulong homeRegion; // RegionHandle of home
17 public LLVector3 homeLocation; // Home Location inside the sim 17 public LLVector3 homeLocation; // Home Location inside the sim
18 public LLVector3 homeLookAt; // Coordinates where the user is looking
19
18 20
19 public int created; // UNIX Epoch Timestamp (User Creation) 21 public int created; // UNIX Epoch Timestamp (User Creation)
20 public int lastLogin; // UNIX Epoch Timestamp (Last Login Time) 22 public int lastLogin; // UNIX Epoch Timestamp (Last Login Time)