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/NHibernate/LLUUIDUserType.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-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/NHibernate/LLUUIDUserType.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/LLUUIDUserType.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs index 0f10344..a7781a3 100644 --- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs +++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using NHibernate; | 31 | using NHibernate; |
32 | using NHibernate.SqlTypes; | 32 | using NHibernate.SqlTypes; |
33 | using NHibernate.UserTypes; | 33 | using NHibernate.UserTypes; |
@@ -35,7 +35,7 @@ using NHibernate.UserTypes; | |||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
36 | { | 36 | { |
37 | [Serializable] | 37 | [Serializable] |
38 | public class LLUUIDUserType: IUserType | 38 | public class UUIDUserType: IUserType |
39 | { | 39 | { |
40 | public object Assemble(object cached, object owner) | 40 | public object Assemble(object cached, object owner) |
41 | { | 41 | { |
@@ -75,7 +75,7 @@ namespace OpenSim.Data.NHibernate | |||
75 | if (!rs.IsDBNull(ord)) | 75 | if (!rs.IsDBNull(ord)) |
76 | { | 76 | { |
77 | string first = (string)rs.GetString(ord); | 77 | string first = (string)rs.GetString(ord); |
78 | uuid = new LLUUID(first); | 78 | uuid = new UUID(first); |
79 | } | 79 | } |
80 | 80 | ||
81 | return uuid; | 81 | return uuid; |
@@ -83,7 +83,7 @@ namespace OpenSim.Data.NHibernate | |||
83 | 83 | ||
84 | public void NullSafeSet(IDbCommand cmd, object obj, int index) | 84 | public void NullSafeSet(IDbCommand cmd, object obj, int index) |
85 | { | 85 | { |
86 | LLUUID uuid = (LLUUID)obj; | 86 | UUID uuid = (UUID)obj; |
87 | ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString(); | 87 | ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString(); |
88 | } | 88 | } |
89 | 89 | ||
@@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate | |||
94 | 94 | ||
95 | public Type ReturnedType | 95 | public Type ReturnedType |
96 | { | 96 | { |
97 | get { return typeof(LLUUID); } | 97 | get { return typeof(UUID); } |
98 | } | 98 | } |
99 | 99 | ||
100 | public SqlType[] SqlTypes | 100 | public SqlType[] SqlTypes |