diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/SQLite/SQLiteManager.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs index 46c40e5..4a7e910 100644 --- a/OpenSim/Data/SQLite/SQLiteManager.cs +++ b/OpenSim/Data/SQLite/SQLiteManager.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SQLite; | 31 | using System.Data.SQLite; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | 35 | ||
36 | namespace OpenSim.Data.SQLite | 36 | namespace OpenSim.Data.SQLite |
@@ -118,7 +118,7 @@ namespace OpenSim.Data.SQLite | |||
118 | // Region Main | 118 | // Region Main |
119 | retval.regionHandle = (ulong) reader["regionHandle"]; | 119 | retval.regionHandle = (ulong) reader["regionHandle"]; |
120 | retval.regionName = (string) reader["regionName"]; | 120 | retval.regionName = (string) reader["regionName"]; |
121 | retval.UUID = new LLUUID((string) reader["uuid"]); | 121 | retval.UUID = new UUID((string) reader["uuid"]); |
122 | 122 | ||
123 | // Secrets | 123 | // Secrets |
124 | retval.regionRecvKey = (string) reader["regionRecvKey"]; | 124 | retval.regionRecvKey = (string) reader["regionRecvKey"]; |
@@ -182,7 +182,7 @@ namespace OpenSim.Data.SQLite | |||
182 | 182 | ||
183 | parameters["regionHandle"] = profile.regionHandle.ToString(); | 183 | parameters["regionHandle"] = profile.regionHandle.ToString(); |
184 | parameters["regionName"] = profile.regionName; | 184 | parameters["regionName"] = profile.regionName; |
185 | parameters["uuid"] = profile.UUID.ToString(); | 185 | parameters["uuid"] = profile.ToString(); |
186 | parameters["regionRecvKey"] = profile.regionRecvKey; | 186 | parameters["regionRecvKey"] = profile.regionRecvKey; |
187 | parameters["regionSendKey"] = profile.regionSendKey; | 187 | parameters["regionSendKey"] = profile.regionSendKey; |
188 | parameters["regionDataURI"] = profile.regionDataURI; | 188 | parameters["regionDataURI"] = profile.regionDataURI; |