aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteGridData.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/SQLite/SQLiteGridData.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteGridData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 8c4574e..f715c0e 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.Reflection; 31using System.Reflection;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
@@ -162,7 +162,7 @@ namespace OpenSim.Data.SQLite
162 /// </summary> 162 /// </summary>
163 /// <param name="uuid">The region UUID</param> 163 /// <param name="uuid">The region UUID</param>
164 /// <returns>The sim profile</returns> 164 /// <returns>The sim profile</returns>
165 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 165 override public RegionProfileData GetProfileByUUID(UUID uuid)
166 { 166 {
167 Dictionary<string, string> param = new Dictionary<string, string>(); 167 Dictionary<string, string> param = new Dictionary<string, string>();
168 param["uuid"] = uuid.ToString(); 168 param["uuid"] = uuid.ToString();
@@ -181,7 +181,7 @@ namespace OpenSim.Data.SQLite
181 /// Returns a list of avatar and UUIDs that match the query 181 /// Returns a list of avatar and UUIDs that match the query
182 /// </summary> 182 /// </summary>
183 /// <remarks>do nothing yet</remarks> 183 /// <remarks>do nothing yet</remarks>
184 public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 184 public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
185 { 185 {
186 //Do nothing yet 186 //Do nothing yet
187 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 187 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
@@ -217,14 +217,14 @@ namespace OpenSim.Data.SQLite
217 /// <param name="handle">The attempted regionHandle of the challenger</param> 217 /// <param name="handle">The attempted regionHandle of the challenger</param>
218 /// <param name="authkey">The secret</param> 218 /// <param name="authkey">The secret</param>
219 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 219 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
220 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 220 override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
221 { 221 {
222 bool throwHissyFit = false; // Should be true by 1.0 222 bool throwHissyFit = false; // Should be true by 1.0
223 223
224 if (throwHissyFit) 224 if (throwHissyFit)
225 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 225 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
226 226
227 RegionProfileData data = GetProfileByLLUUID(uuid); 227 RegionProfileData data = GetProfileByUUID(uuid);
228 228
229 return (handle == data.regionHandle && authkey == data.regionSecret); 229 return (handle == data.regionHandle && authkey == data.regionSecret);
230 } 230 }
@@ -238,7 +238,7 @@ namespace OpenSim.Data.SQLite
238 /// <param name="authhash"></param> 238 /// <param name="authhash"></param>
239 /// <param name="challenge"></param> 239 /// <param name="challenge"></param>
240 /// <returns></returns> 240 /// <returns></returns>
241 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 241 public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
242 { 242 {
243 // SHA512Managed HashProvider = new SHA512Managed(); 243 // SHA512Managed HashProvider = new SHA512Managed();
244 // Encoding TextProvider = new UTF8Encoding(); 244 // Encoding TextProvider = new UTF8Encoding();