aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGrid.Framework.Data.MySQL
diff options
context:
space:
mode:
authorAdam Frisby2007-05-04 04:11:59 +0000
committerAdam Frisby2007-05-04 04:11:59 +0000
commit89a6d6bab7bfc138c60eef7de18fc40c7365a81d (patch)
tree92ca81dd7d61b994c17d263fd4d3be7456a837dd /OpenGrid.Framework.Data.MySQL
parentDunno, I must have changed something. (diff)
downloadopensim-SC_OLD-89a6d6bab7bfc138c60eef7de18fc40c7365a81d.zip
opensim-SC_OLD-89a6d6bab7bfc138c60eef7de18fc40c7365a81d.tar.gz
opensim-SC_OLD-89a6d6bab7bfc138c60eef7de18fc40c7365a81d.tar.bz2
opensim-SC_OLD-89a6d6bab7bfc138c60eef7de18fc40c7365a81d.tar.xz
I dub thee working. Maybe.
Diffstat (limited to 'OpenGrid.Framework.Data.MySQL')
-rw-r--r--OpenGrid.Framework.Data.MySQL/MySQLGridData.cs4
-rw-r--r--OpenGrid.Framework.Data.MySQL/MySQLManager.cs10
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index 7a78800..2ea2db4 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
@@ -48,7 +48,9 @@ namespace OpenGrid.Framework.Data.MySQL
48 if (throwHissyFit) 48 if (throwHissyFit)
49 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 49 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
50 50
51 return true; 51 SimProfileData data = GetProfileByLLUUID(uuid);
52
53 return (handle == data.regionHandle && authkey == data.regionSecret);
52 } 54 }
53 55
54 /// <summary> 56 /// <summary>
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index ec69549..0147b5b 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -85,10 +85,10 @@ namespace OpenGrid.Framework.Data.MySQL
85 85
86 // Region Server 86 // Region Server
87 retval.regionDataURI = (string)reader["regionDataURI"]; 87 retval.regionDataURI = (string)reader["regionDataURI"];
88 retval.regionOnline = false; 88 retval.regionOnline = false; // Needs to be pinged before this can be set.
89 retval.serverIP = ""; 89 retval.serverIP = (string)reader["serverIP"];
90 retval.serverPort = 0; 90 retval.serverPort = (uint)reader["serverPort"];
91 retval.serverURI = ""; 91 retval.serverURI = (string)reader["serverURI"];
92 92
93 // Location 93 // Location
94 retval.regionLocX = (uint)((int)reader["locX"]); 94 retval.regionLocX = (uint)((int)reader["locX"]);
@@ -103,7 +103,7 @@ namespace OpenGrid.Framework.Data.MySQL
103 } 103 }
104 else 104 else
105 { 105 {
106 return null; 106 throw new Exception("No rows to return");
107 } 107 }
108 return retval; 108 return retval;
109 } 109 }