aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
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
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 '')
-rw-r--r--OpenSim/Data/AssetDataBase.cs6
-rw-r--r--OpenSim/Data/Base/AppearanceTableMapper.cs116
-rw-r--r--OpenSim/Data/Base/BaseRowMapper.cs4
-rw-r--r--OpenSim/Data/GridDataBase.cs6
-rw-r--r--OpenSim/Data/IGridData.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs8
-rw-r--r--OpenSim/Data/MSSQL/MSSQLEstateData.cs26
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs14
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs48
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs38
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs144
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs116
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs26
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs12
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs54
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs134
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs138
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs62
-rw-r--r--OpenSim/Data/NHibernate/LLQuaternionUserType.cs15
-rw-r--r--OpenSim/Data/NHibernate/LLUUIDUserType.cs10
-rw-r--r--OpenSim/Data/NHibernate/LLVector3UserType.cs12
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs8
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs28
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs28
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs36
-rw-r--r--OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml4
-rw-r--r--OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml8
-rw-r--r--OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml14
-rw-r--r--OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml52
-rw-r--r--OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml12
-rw-r--r--OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml56
-rw-r--r--OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml12
-rw-r--r--OpenSim/Data/NHibernate/Terrain.cs10
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs14
-rw-r--r--OpenSim/Data/Null/NullDataStore.cs20
-rw-r--r--OpenSim/Data/OpenSimDataReader.cs10
-rw-r--r--OpenSim/Data/OpenSimDatabaseConnector.cs6
-rw-r--r--OpenSim/Data/OpenSimObjectFieldMapper.cs18
-rw-r--r--OpenSim/Data/PrimitiveBaseShapeTableMapper.cs8
-rw-r--r--OpenSim/Data/RegionProfileData.cs17
-rw-r--r--OpenSim/Data/ReservationData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs10
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs26
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs12
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs54
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs128
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs90
-rw-r--r--OpenSim/Data/UserDataBase.cs36
51 files changed, 865 insertions, 865 deletions
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 690abd0..f38d578 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -25,17 +25,17 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30 30
31namespace OpenSim.Data 31namespace OpenSim.Data
32{ 32{
33 public abstract class AssetDataBase : IAssetProviderPlugin 33 public abstract class AssetDataBase : IAssetProviderPlugin
34 { 34 {
35 public abstract AssetBase FetchAsset(LLUUID uuid); 35 public abstract AssetBase FetchAsset(UUID uuid);
36 public abstract void CreateAsset(AssetBase asset); 36 public abstract void CreateAsset(AssetBase asset);
37 public abstract void UpdateAsset(AssetBase asset); 37 public abstract void UpdateAsset(AssetBase asset);
38 public abstract bool ExistsAsset(LLUUID uuid); 38 public abstract bool ExistsAsset(UUID uuid);
39 39
40 public abstract string Version { get; } 40 public abstract string Version { get; }
41 public abstract string Name { get; } 41 public abstract string Name { get; }
diff --git a/OpenSim/Data/Base/AppearanceTableMapper.cs b/OpenSim/Data/Base/AppearanceTableMapper.cs
index 7964880..c1bb739 100644
--- a/OpenSim/Data/Base/AppearanceTableMapper.cs
+++ b/OpenSim/Data/Base/AppearanceTableMapper.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Data.Base; 30using OpenSim.Data.Base;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
@@ -55,15 +55,15 @@ namespace OpenSim.Data.Base
55 m_schema = rowMapperSchema; 55 m_schema = rowMapperSchema;
56 56
57 m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID", 57 m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID",
58 delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.UUID; }, 58 delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.Guid; },
59 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new LLUUID(value.ToString()); }); 59 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new UUID(value.ToString()); });
60 60
61 rowMapperSchema.AddMapping<uint>("Serial", 61 rowMapperSchema.AddMapping<uint>("Serial",
62 delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; }, 62 delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; },
63 delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; }); 63 delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; });
64 64
65 rowMapperSchema.AddMapping<Guid>("WearableItem0", 65 rowMapperSchema.AddMapping<Guid>("WearableItem0",
66 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.UUID; }, 66 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.Guid; },
67 delegate(AppearanceRowMapper mapper, Guid value) 67 delegate(AppearanceRowMapper mapper, Guid value)
68 { 68 {
69 if (mapper.Object.Wearables == null) 69 if (mapper.Object.Wearables == null)
@@ -74,121 +74,121 @@ namespace OpenSim.Data.Base
74 mapper.Object.Wearables[i] = new AvatarWearable(); 74 mapper.Object.Wearables[i] = new AvatarWearable();
75 } 75 }
76 } 76 }
77 mapper.Object.Wearables[0].ItemID = new LLUUID(value.ToString()); 77 mapper.Object.Wearables[0].ItemID = new UUID(value.ToString());
78 }); 78 });
79 79
80 rowMapperSchema.AddMapping<Guid>("WearableAsset0", 80 rowMapperSchema.AddMapping<Guid>("WearableAsset0",
81 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.UUID; }, 81 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].AssetID.Guid; },
82 delegate(AppearanceRowMapper mapper, Guid value) 82 delegate(AppearanceRowMapper mapper, Guid value)
83 { mapper.Object.Wearables[0].AssetID = new LLUUID(value.ToString()); }); 83 { mapper.Object.Wearables[0].AssetID = new UUID(value.ToString()); });
84 84
85 rowMapperSchema.AddMapping<Guid>("WearableItem1", 85 rowMapperSchema.AddMapping<Guid>("WearableItem1",
86 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.UUID; }, 86 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].ItemID.Guid; },
87 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new LLUUID(value.ToString()); }); 87 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[1].ItemID = new UUID(value.ToString()); });
88 88
89 rowMapperSchema.AddMapping<Guid>("WearableAsset1", 89 rowMapperSchema.AddMapping<Guid>("WearableAsset1",
90 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.UUID; }, 90 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[1].AssetID.Guid; },
91 delegate(AppearanceRowMapper mapper, Guid value) 91 delegate(AppearanceRowMapper mapper, Guid value)
92 { mapper.Object.Wearables[1].AssetID = new LLUUID(value.ToString()); }); 92 { mapper.Object.Wearables[1].AssetID = new UUID(value.ToString()); });
93 93
94 rowMapperSchema.AddMapping<Guid>("WearableItem2", 94 rowMapperSchema.AddMapping<Guid>("WearableItem2",
95 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.UUID; }, 95 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].ItemID.Guid; },
96 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new LLUUID(value.ToString()); }); 96 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[2].ItemID = new UUID(value.ToString()); });
97 97
98 rowMapperSchema.AddMapping<Guid>("WearableAsset2", 98 rowMapperSchema.AddMapping<Guid>("WearableAsset2",
99 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.UUID; }, 99 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[2].AssetID.Guid; },
100 delegate(AppearanceRowMapper mapper, Guid value) 100 delegate(AppearanceRowMapper mapper, Guid value)
101 { mapper.Object.Wearables[2].AssetID = new LLUUID(value.ToString()); }); 101 { mapper.Object.Wearables[2].AssetID = new UUID(value.ToString()); });
102 102
103 rowMapperSchema.AddMapping<Guid>("WearableItem3", 103 rowMapperSchema.AddMapping<Guid>("WearableItem3",
104 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.UUID; }, 104 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].ItemID.Guid; },
105 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new LLUUID(value.ToString()); }); 105 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[3].ItemID = new UUID(value.ToString()); });
106 106
107 rowMapperSchema.AddMapping<Guid>("WearableAsset3", 107 rowMapperSchema.AddMapping<Guid>("WearableAsset3",
108 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.UUID; }, 108 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[3].AssetID.Guid; },
109 delegate(AppearanceRowMapper mapper, Guid value) 109 delegate(AppearanceRowMapper mapper, Guid value)
110 { mapper.Object.Wearables[3].AssetID = new LLUUID(value.ToString()); }); 110 { mapper.Object.Wearables[3].AssetID = new UUID(value.ToString()); });
111 111
112 rowMapperSchema.AddMapping<Guid>("WearableItem4", 112 rowMapperSchema.AddMapping<Guid>("WearableItem4",
113 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.UUID; }, 113 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].ItemID.Guid; },
114 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new LLUUID(value.ToString()); }); 114 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[4].ItemID = new UUID(value.ToString()); });
115 115
116 rowMapperSchema.AddMapping<Guid>("WearableAsset4", 116 rowMapperSchema.AddMapping<Guid>("WearableAsset4",
117 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.UUID; }, 117 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[4].AssetID.Guid; },
118 delegate(AppearanceRowMapper mapper, Guid value) 118 delegate(AppearanceRowMapper mapper, Guid value)
119 { mapper.Object.Wearables[4].AssetID = new LLUUID(value.ToString()); }); 119 { mapper.Object.Wearables[4].AssetID = new UUID(value.ToString()); });
120 120
121 rowMapperSchema.AddMapping<Guid>("WearableItem5", 121 rowMapperSchema.AddMapping<Guid>("WearableItem5",
122 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.UUID; }, 122 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].ItemID.Guid; },
123 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new LLUUID(value.ToString()); }); 123 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[5].ItemID = new UUID(value.ToString()); });
124 124
125 rowMapperSchema.AddMapping<Guid>("WearableAsset5", 125 rowMapperSchema.AddMapping<Guid>("WearableAsset5",
126 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.UUID; }, 126 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[5].AssetID.Guid; },
127 delegate(AppearanceRowMapper mapper, Guid value) 127 delegate(AppearanceRowMapper mapper, Guid value)
128 { mapper.Object.Wearables[5].AssetID = new LLUUID(value.ToString()); }); 128 { mapper.Object.Wearables[5].AssetID = new UUID(value.ToString()); });
129 129
130 rowMapperSchema.AddMapping<Guid>("WearableItem6", 130 rowMapperSchema.AddMapping<Guid>("WearableItem6",
131 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.UUID; }, 131 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].ItemID.Guid; },
132 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new LLUUID(value.ToString()); }); 132 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[6].ItemID = new UUID(value.ToString()); });
133 133
134 rowMapperSchema.AddMapping<Guid>("WearableAsset6", 134 rowMapperSchema.AddMapping<Guid>("WearableAsset6",
135 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.UUID; }, 135 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[6].AssetID.Guid; },
136 delegate(AppearanceRowMapper mapper, Guid value) 136 delegate(AppearanceRowMapper mapper, Guid value)
137 { mapper.Object.Wearables[6].AssetID = new LLUUID(value.ToString()); }); 137 { mapper.Object.Wearables[6].AssetID = new UUID(value.ToString()); });
138 138
139 rowMapperSchema.AddMapping<Guid>("WearableItem7", 139 rowMapperSchema.AddMapping<Guid>("WearableItem7",
140 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.UUID; }, 140 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].ItemID.Guid; },
141 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new LLUUID(value.ToString()); }); 141 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[7].ItemID = new UUID(value.ToString()); });
142 142
143 rowMapperSchema.AddMapping<Guid>("WearableAsset7", 143 rowMapperSchema.AddMapping<Guid>("WearableAsset7",
144 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.UUID; }, 144 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[7].AssetID.Guid; },
145 delegate(AppearanceRowMapper mapper, Guid value) 145 delegate(AppearanceRowMapper mapper, Guid value)
146 { mapper.Object.Wearables[7].AssetID = new LLUUID(value.ToString()); }); 146 { mapper.Object.Wearables[7].AssetID = new UUID(value.ToString()); });
147 147
148 rowMapperSchema.AddMapping<Guid>("WearableItem8", 148 rowMapperSchema.AddMapping<Guid>("WearableItem8",
149 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.UUID; }, 149 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].ItemID.Guid; },
150 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new LLUUID(value.ToString()); }); 150 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[8].ItemID = new UUID(value.ToString()); });
151 151
152 rowMapperSchema.AddMapping<Guid>("WearableAsset8", 152 rowMapperSchema.AddMapping<Guid>("WearableAsset8",
153 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.UUID; }, 153 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[8].AssetID.Guid; },
154 delegate(AppearanceRowMapper mapper, Guid value) 154 delegate(AppearanceRowMapper mapper, Guid value)
155 { mapper.Object.Wearables[8].AssetID = new LLUUID(value.ToString()); }); 155 { mapper.Object.Wearables[8].AssetID = new UUID(value.ToString()); });
156 156
157 rowMapperSchema.AddMapping<Guid>("WearableItem9", 157 rowMapperSchema.AddMapping<Guid>("WearableItem9",
158 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.UUID; }, 158 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].ItemID.Guid; },
159 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new LLUUID(value.ToString()); }); 159 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[9].ItemID = new UUID(value.ToString()); });
160 160
161 rowMapperSchema.AddMapping<Guid>("WearableAsset9", 161 rowMapperSchema.AddMapping<Guid>("WearableAsset9",
162 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.UUID; }, 162 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[9].AssetID.Guid; },
163 delegate(AppearanceRowMapper mapper, Guid value) 163 delegate(AppearanceRowMapper mapper, Guid value)
164 { mapper.Object.Wearables[9].AssetID = new LLUUID(value.ToString()); }); 164 { mapper.Object.Wearables[9].AssetID = new UUID(value.ToString()); });
165 165
166 rowMapperSchema.AddMapping<Guid>("WearableItem10", 166 rowMapperSchema.AddMapping<Guid>("WearableItem10",
167 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.UUID; }, 167 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].ItemID.Guid; },
168 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new LLUUID(value.ToString()); }); 168 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[10].ItemID = new UUID(value.ToString()); });
169 169
170 rowMapperSchema.AddMapping<Guid>("WearableAsset10", 170 rowMapperSchema.AddMapping<Guid>("WearableAsset10",
171 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.UUID; }, 171 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[10].AssetID.Guid; },
172 delegate(AppearanceRowMapper mapper, Guid value) 172 delegate(AppearanceRowMapper mapper, Guid value)
173 { mapper.Object.Wearables[10].AssetID = new LLUUID(value.ToString()); }); 173 { mapper.Object.Wearables[10].AssetID = new UUID(value.ToString()); });
174 174
175 rowMapperSchema.AddMapping<Guid>("WearableItem11", 175 rowMapperSchema.AddMapping<Guid>("WearableItem11",
176 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.UUID; }, 176 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].ItemID.Guid; },
177 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new LLUUID(value.ToString()); }); 177 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[11].ItemID = new UUID(value.ToString()); });
178 178
179 rowMapperSchema.AddMapping<Guid>("WearableAsset11", 179 rowMapperSchema.AddMapping<Guid>("WearableAsset11",
180 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.UUID; }, 180 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[11].AssetID.Guid; },
181 delegate(AppearanceRowMapper mapper, Guid value) 181 delegate(AppearanceRowMapper mapper, Guid value)
182 { mapper.Object.Wearables[11].AssetID = new LLUUID(value.ToString()); }); 182 { mapper.Object.Wearables[11].AssetID = new UUID(value.ToString()); });
183 183
184 rowMapperSchema.AddMapping<Guid>("WearableItem12", 184 rowMapperSchema.AddMapping<Guid>("WearableItem12",
185 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.UUID; }, 185 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].ItemID.Guid; },
186 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new LLUUID(value.ToString()); }); 186 delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Wearables[12].ItemID = new UUID(value.ToString()); });
187 187
188 rowMapperSchema.AddMapping<Guid>("WearableAsset12", 188 rowMapperSchema.AddMapping<Guid>("WearableAsset12",
189 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.UUID; }, 189 delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[12].AssetID.Guid; },
190 delegate(AppearanceRowMapper mapper, Guid value) 190 delegate(AppearanceRowMapper mapper, Guid value)
191 { mapper.Object.Wearables[12].AssetID = new LLUUID(value.ToString()); }); 191 { mapper.Object.Wearables[12].AssetID = new UUID(value.ToString()); });
192 192
193 } 193 }
194 194
@@ -213,7 +213,7 @@ namespace OpenSim.Data.Base
213 public bool Update(Guid userID, AvatarAppearance appearance) 213 public bool Update(Guid userID, AvatarAppearance appearance)
214 { 214 {
215 AppearanceRowMapper mapper = CreateRowMapper(appearance); 215 AppearanceRowMapper mapper = CreateRowMapper(appearance);
216 return Update(appearance.Owner.UUID, mapper); 216 return Update(appearance.Owner.Guid, mapper);
217 } 217 }
218 218
219 /// <summary> 219 /// <summary>
@@ -244,7 +244,7 @@ namespace OpenSim.Data.Base
244 protected AppearanceRowMapper FromReader(BaseDataReader reader, AvatarAppearance appearance) 244 protected AppearanceRowMapper FromReader(BaseDataReader reader, AvatarAppearance appearance)
245 { 245 {
246 AppearanceRowMapper mapper = CreateRowMapper(appearance); 246 AppearanceRowMapper mapper = CreateRowMapper(appearance);
247 mapper.FillObject(reader); 247 mapper.FiPrimitive(reader);
248 return mapper; 248 return mapper;
249 } 249 }
250 250
@@ -256,7 +256,7 @@ namespace OpenSim.Data.Base
256 public override AppearanceRowMapper FromReader(BaseDataReader reader) 256 public override AppearanceRowMapper FromReader(BaseDataReader reader)
257 { 257 {
258 AppearanceRowMapper mapper = CreateRowMapper(); 258 AppearanceRowMapper mapper = CreateRowMapper();
259 mapper.FillObject(reader); 259 mapper.FiPrimitive(reader);
260 return mapper; 260 return mapper;
261 } 261 }
262 262
diff --git a/OpenSim/Data/Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs
index d07f9b3..d0e545b 100644
--- a/OpenSim/Data/Base/BaseRowMapper.cs
+++ b/OpenSim/Data/Base/BaseRowMapper.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Data.Base
32 /// </summary> 32 /// </summary>
33 public abstract class BaseRowMapper 33 public abstract class BaseRowMapper
34 { 34 {
35 public abstract void FillObject(BaseDataReader reader); 35 public abstract void FiPrimitive(BaseDataReader reader);
36 } 36 }
37 37
38 /// <summary> 38 /// <summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Data.Base
67 /// 67 ///
68 /// </summary> 68 /// </summary>
69 /// <param name="reader"></param> 69 /// <param name="reader"></param>
70 public override void FillObject(BaseDataReader reader) 70 public override void FiPrimitive(BaseDataReader reader)
71 { 71 {
72 foreach (BaseFieldMapper fieldMapper in m_schema.Fields.Values) 72 foreach (BaseFieldMapper fieldMapper in m_schema.Fields.Values)
73 { 73 {
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 0b56d07..0fd4d86 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.cs
@@ -25,17 +25,17 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Data 30namespace OpenSim.Data
31{ 31{
32 public abstract class GridDataBase : IGridDataPlugin 32 public abstract class GridDataBase : IGridDataPlugin
33 { 33 {
34 public abstract RegionProfileData GetProfileByHandle(ulong regionHandle); 34 public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
35 public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID); 35 public abstract RegionProfileData GetProfileByUUID(UUID UUID);
36 public abstract RegionProfileData GetProfileByString(string regionName); 36 public abstract RegionProfileData GetProfileByString(string regionName);
37 public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax); 37 public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
38 public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey); 38 public abstract bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
39 public abstract DataResponse AddProfile(RegionProfileData profile); 39 public abstract DataResponse AddProfile(RegionProfileData profile);
40 public abstract ReservationData GetReservationAtPoint(uint x, uint y); 40 public abstract ReservationData GetReservationAtPoint(uint x, uint y);
41 public abstract DataResponse UpdateProfile(RegionProfileData profile); 41 public abstract DataResponse UpdateProfile(RegionProfileData profile);
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index c77bbb7..c5f4ee1 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30 30
31namespace OpenSim.Data 31namespace OpenSim.Data
@@ -60,7 +60,7 @@ namespace OpenSim.Data
60 /// </summary> 60 /// </summary>
61 /// <param name="UUID">A 128bit UUID</param> 61 /// <param name="UUID">A 128bit UUID</param>
62 /// <returns>A sim profile</returns> 62 /// <returns>A sim profile</returns>
63 RegionProfileData GetProfileByLLUUID(LLUUID UUID); 63 RegionProfileData GetProfileByUUID(UUID UUID);
64 64
65 /// <summary> 65 /// <summary>
66 /// Returns a sim profile from a string match 66 /// Returns a sim profile from a string match
@@ -87,7 +87,7 @@ namespace OpenSim.Data
87 /// <param name="regionHandle">The regionhandle sent by the sim</param> 87 /// <param name="regionHandle">The regionhandle sent by the sim</param>
88 /// <param name="simrecvkey">The receiving key sent by the sim</param> 88 /// <param name="simrecvkey">The receiving key sent by the sim</param>
89 /// <returns>Whether the sim has been authenticated</returns> 89 /// <returns>Whether the sim has been authenticated</returns>
90 bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey); 90 bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
91 91
92 /// <summary> 92 /// <summary>
93 /// Adds a new profile to the database 93 /// Adds a new profile to the database
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index e10e3aa..ed1c91b 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -84,7 +84,7 @@ namespace OpenSim.Data.MSSQL
84 /// </summary> 84 /// </summary>
85 /// <param name="assetID">the asset UUID</param> 85 /// <param name="assetID">the asset UUID</param>
86 /// <returns></returns> 86 /// <returns></returns>
87 override public AssetBase FetchAsset(LLUUID assetID) 87 override public AssetBase FetchAsset(UUID assetID)
88 { 88 {
89 Dictionary<string, string> param = new Dictionary<string, string>(); 89 Dictionary<string, string> param = new Dictionary<string, string>();
90 param["id"] = assetID.ToString(); 90 param["id"] = assetID.ToString();
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL
102 /// <param name="asset">the asset</param> 102 /// <param name="asset">the asset</param>
103 override public void CreateAsset(AssetBase asset) 103 override public void CreateAsset(AssetBase asset)
104 { 104 {
105 if (ExistsAsset((LLUUID) asset.FullID)) 105 if (ExistsAsset((UUID) asset.FullID))
106 { 106 {
107 return; 107 return;
108 } 108 }
@@ -181,7 +181,7 @@ namespace OpenSim.Data.MSSQL
181 /// </summary> 181 /// </summary>
182 /// <param name="uuid"></param> 182 /// <param name="uuid"></param>
183 /// <returns>true if exist.</returns> 183 /// <returns>true if exist.</returns>
184 override public bool ExistsAsset(LLUUID uuid) 184 override public bool ExistsAsset(UUID uuid)
185 { 185 {
186 if (FetchAsset(uuid) != null) 186 if (FetchAsset(uuid) != null)
187 { 187 {
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 74eecd8..b42c67f 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL
102 /// </summary> 102 /// </summary>
103 /// <param name="regionID">region ID.</param> 103 /// <param name="regionID">region ID.</param>
104 /// <returns></returns> 104 /// <returns></returns>
105 public EstateSettings LoadEstateSettings(LLUUID regionID) 105 public EstateSettings LoadEstateSettings(UUID regionID)
106 { 106 {
107 EstateSettings es = new EstateSettings(); 107 EstateSettings es = new EstateSettings();
108 108
@@ -128,10 +128,10 @@ namespace OpenSim.Data.MSSQL
128 else 128 else
129 _FieldMap[name].SetValue(es, false); 129 _FieldMap[name].SetValue(es, false);
130 } 130 }
131 else if (_FieldMap[name].GetValue(es) is LLUUID) 131 else if (_FieldMap[name].GetValue(es) is UUID)
132 { 132 {
133 LLUUID uuid; 133 UUID uuid;
134 LLUUID.TryParse(reader[name].ToString(), out uuid); 134 UUID.TryParse(reader[name].ToString(), out uuid);
135 135
136 _FieldMap[name].SetValue(es, uuid); 136 _FieldMap[name].SetValue(es, uuid);
137 } 137 }
@@ -333,8 +333,8 @@ namespace OpenSim.Data.MSSQL
333 { 333 {
334 EstateBan eb = new EstateBan(); 334 EstateBan eb = new EstateBan();
335 335
336 LLUUID uuid; 336 UUID uuid;
337 LLUUID.TryParse(reader["bannedUUID"].ToString(), out uuid); 337 UUID.TryParse(reader["bannedUUID"].ToString(), out uuid);
338 338
339 eb.bannedUUID = uuid; 339 eb.bannedUUID = uuid;
340 eb.bannedIP = "0.0.0.0"; 340 eb.bannedIP = "0.0.0.0";
@@ -345,9 +345,9 @@ namespace OpenSim.Data.MSSQL
345 } 345 }
346 } 346 }
347 347
348 private LLUUID[] LoadUUIDList(uint estateID, string table) 348 private UUID[] LoadUUIDList(uint estateID, string table)
349 { 349 {
350 List<LLUUID> uuids = new List<LLUUID>(); 350 List<UUID> uuids = new List<UUID>();
351 351
352 string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table); 352 string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
353 353
@@ -361,8 +361,8 @@ namespace OpenSim.Data.MSSQL
361 { 361 {
362 // EstateBan eb = new EstateBan(); 362 // EstateBan eb = new EstateBan();
363 363
364 LLUUID uuid; 364 UUID uuid;
365 LLUUID.TryParse(reader["uuid"].ToString(), out uuid); 365 UUID.TryParse(reader["uuid"].ToString(), out uuid);
366 366
367 uuids.Add(uuid); 367 uuids.Add(uuid);
368 } 368 }
@@ -399,7 +399,7 @@ namespace OpenSim.Data.MSSQL
399 } 399 }
400 } 400 }
401 401
402 private void SaveUUIDList(uint estateID, string table, LLUUID[] data) 402 private void SaveUUIDList(uint estateID, string table, UUID[] data)
403 { 403 {
404 //Delete first 404 //Delete first
405 string sql = string.Format("delete from {0} where EstateID = @EstateID", table); 405 string sql = string.Format("delete from {0} where EstateID = @EstateID", table);
@@ -416,7 +416,7 @@ namespace OpenSim.Data.MSSQL
416 416
417 bool createParamOnce = true; 417 bool createParamOnce = true;
418 418
419 foreach (LLUUID uuid in data) 419 foreach (UUID uuid in data)
420 { 420 {
421 if (createParamOnce) 421 if (createParamOnce)
422 { 422 {
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 423d4aa..47edc4b 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.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
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MSSQL
176 /// </summary> 176 /// </summary>
177 /// <param name="uuid">The region UUID</param> 177 /// <param name="uuid">The region UUID</param>
178 /// <returns>The sim profile</returns> 178 /// <returns>The sim profile</returns>
179 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 179 override public RegionProfileData GetProfileByUUID(UUID uuid)
180 { 180 {
181 Dictionary<string, string> param = new Dictionary<string, string>(); 181 Dictionary<string, string> param = new Dictionary<string, string>();
182 param["uuid"] = uuid.ToString(); 182 param["uuid"] = uuid.ToString();
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MSSQL
284 284
285 parameters["regionHandle"] = profile.regionHandle.ToString(); 285 parameters["regionHandle"] = profile.regionHandle.ToString();
286 parameters["regionName"] = profile.regionName; 286 parameters["regionName"] = profile.regionName;
287 parameters["uuid"] = profile.UUID.ToString(); 287 parameters["uuid"] = profile.ToString();
288 parameters["regionRecvKey"] = profile.regionRecvKey; 288 parameters["regionRecvKey"] = profile.regionRecvKey;
289 parameters["regionSecret"] = profile.regionSecret; 289 parameters["regionSecret"] = profile.regionSecret;
290 parameters["regionSendKey"] = profile.regionSendKey; 290 parameters["regionSendKey"] = profile.regionSendKey;
@@ -352,7 +352,7 @@ namespace OpenSim.Data.MSSQL
352 352
353 parameters["regionHandle"] = profile.regionHandle.ToString(); 353 parameters["regionHandle"] = profile.regionHandle.ToString();
354 parameters["regionName"] = profile.regionName; 354 parameters["regionName"] = profile.regionName;
355 parameters["uuid"] = profile.UUID.ToString(); 355 parameters["uuid"] = profile.ToString();
356 parameters["regionRecvKey"] = profile.regionRecvKey; 356 parameters["regionRecvKey"] = profile.regionRecvKey;
357 parameters["regionSecret"] = profile.regionSecret; 357 parameters["regionSecret"] = profile.regionSecret;
358 parameters["regionSendKey"] = profile.regionSendKey; 358 parameters["regionSendKey"] = profile.regionSendKey;
@@ -403,14 +403,14 @@ namespace OpenSim.Data.MSSQL
403 /// <param name="handle">The attempted regionHandle of the challenger</param> 403 /// <param name="handle">The attempted regionHandle of the challenger</param>
404 /// <param name="authkey">The secret</param> 404 /// <param name="authkey">The secret</param>
405 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 405 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
406 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 406 override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
407 { 407 {
408 bool throwHissyFit = false; // Should be true by 1.0 408 bool throwHissyFit = false; // Should be true by 1.0
409 409
410 if (throwHissyFit) 410 if (throwHissyFit)
411 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 411 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
412 412
413 RegionProfileData data = GetProfileByLLUUID(uuid); 413 RegionProfileData data = GetProfileByUUID(uuid);
414 414
415 return (handle == data.regionHandle && authkey == data.regionSecret); 415 return (handle == data.regionHandle && authkey == data.regionSecret);
416 } 416 }
@@ -424,7 +424,7 @@ namespace OpenSim.Data.MSSQL
424 /// <param name="authhash"></param> 424 /// <param name="authhash"></param>
425 /// <param name="challenge"></param> 425 /// <param name="challenge"></param>
426 /// <returns></returns> 426 /// <returns></returns>
427 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 427 public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
428 { 428 {
429 // SHA512Managed HashProvider = new SHA512Managed(); 429 // SHA512Managed HashProvider = new SHA512Managed();
430 // Encoding TextProvider = new UTF8Encoding(); 430 // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 9e60b16..e7df7c1 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -167,7 +167,7 @@ namespace OpenSim.Data.MSSQL
167 /// </summary> 167 /// </summary>
168 /// <param name="folderID">The folder to search</param> 168 /// <param name="folderID">The folder to search</param>
169 /// <returns>A list containing inventory items</returns> 169 /// <returns>A list containing inventory items</returns>
170 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 170 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
171 { 171 {
172 try 172 try
173 { 173 {
@@ -201,13 +201,13 @@ namespace OpenSim.Data.MSSQL
201 /// </summary> 201 /// </summary>
202 /// <param name="user">The user whos inventory is to be searched</param> 202 /// <param name="user">The user whos inventory is to be searched</param>
203 /// <returns>A list of folder objects</returns> 203 /// <returns>A list of folder objects</returns>
204 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 204 public List<InventoryFolderBase> getUserRootFolders(UUID user)
205 { 205 {
206 try 206 try
207 { 207 {
208 Dictionary<string, string> param = new Dictionary<string, string>(); 208 Dictionary<string, string> param = new Dictionary<string, string>();
209 param["uuid"] = user.ToString(); 209 param["uuid"] = user.ToString();
210 param["zero"] = LLUUID.Zero.ToString(); 210 param["zero"] = UUID.Zero.ToString();
211 211
212 using (IDbCommand result = 212 using (IDbCommand result =
213 database.Query( 213 database.Query(
@@ -235,13 +235,13 @@ namespace OpenSim.Data.MSSQL
235 /// </summary> 235 /// </summary>
236 /// <param name="user">the User UUID</param> 236 /// <param name="user">the User UUID</param>
237 /// <returns></returns> 237 /// <returns></returns>
238 public InventoryFolderBase getUserRootFolder(LLUUID user) 238 public InventoryFolderBase getUserRootFolder(UUID user)
239 { 239 {
240 try 240 try
241 { 241 {
242 Dictionary<string, string> param = new Dictionary<string, string>(); 242 Dictionary<string, string> param = new Dictionary<string, string>();
243 param["uuid"] = user.ToString(); 243 param["uuid"] = user.ToString();
244 param["zero"] = LLUUID.Zero.ToString(); 244 param["zero"] = UUID.Zero.ToString();
245 245
246 using (IDbCommand result = 246 using (IDbCommand result =
247 database.Query( 247 database.Query(
@@ -281,7 +281,7 @@ namespace OpenSim.Data.MSSQL
281 /// </summary> 281 /// </summary>
282 /// <param name="parentID">The folder to search</param> 282 /// <param name="parentID">The folder to search</param>
283 /// <returns>A list of inventory folders</returns> 283 /// <returns>A list of inventory folders</returns>
284 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 284 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
285 { 285 {
286 try 286 try
287 { 287 {
@@ -318,23 +318,23 @@ namespace OpenSim.Data.MSSQL
318 { 318 {
319 InventoryItemBase item = new InventoryItemBase(); 319 InventoryItemBase item = new InventoryItemBase();
320 320
321 item.ID = new LLUUID((string) reader["inventoryID"]); 321 item.ID = new UUID((string) reader["inventoryID"]);
322 item.AssetID = new LLUUID((string) reader["assetID"]); 322 item.AssetID = new UUID((string) reader["assetID"]);
323 item.AssetType = (int) reader["assetType"]; 323 item.AssetType = (int) reader["assetType"];
324 item.Folder = new LLUUID((string) reader["parentFolderID"]); 324 item.Folder = new UUID((string) reader["parentFolderID"]);
325 item.Owner = new LLUUID((string) reader["avatarID"]); 325 item.Owner = new UUID((string) reader["avatarID"]);
326 item.Name = (string) reader["inventoryName"]; 326 item.Name = (string) reader["inventoryName"];
327 item.Description = (string) reader["inventoryDescription"]; 327 item.Description = (string) reader["inventoryDescription"];
328 item.NextPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryNextPermissions"]); 328 item.NextPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryNextPermissions"]);
329 item.CurrentPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryCurrentPermissions"]); 329 item.CurrentPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryCurrentPermissions"]);
330 item.InvType = (int) reader["invType"]; 330 item.InvType = (int) reader["invType"];
331 item.Creator = new LLUUID((string) reader["creatorID"]); 331 item.Creator = new UUID((string) reader["creatorID"]);
332 item.BasePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryBasePermissions"]); 332 item.BasePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryBasePermissions"]);
333 item.EveryOnePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryEveryOnePermissions"]); 333 item.EveryOnePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryEveryOnePermissions"]);
334 item.SalePrice = (int) reader["salePrice"]; 334 item.SalePrice = (int) reader["salePrice"];
335 item.SaleType = Convert.ToByte(reader["saleType"]); 335 item.SaleType = Convert.ToByte(reader["saleType"]);
336 item.CreationDate = (int) reader["creationDate"]; 336 item.CreationDate = (int) reader["creationDate"];
337 item.GroupID = new LLUUID(reader["groupID"].ToString()); 337 item.GroupID = new UUID(reader["groupID"].ToString());
338 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); 338 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
339 item.Flags = ConvertInt32BitFieldToUint32((int)reader["flags"]); 339 item.Flags = ConvertInt32BitFieldToUint32((int)reader["flags"]);
340 340
@@ -353,7 +353,7 @@ namespace OpenSim.Data.MSSQL
353 /// </summary> 353 /// </summary>
354 /// <param name="item">The item to return</param> 354 /// <param name="item">The item to return</param>
355 /// <returns>An inventory item</returns> 355 /// <returns>An inventory item</returns>
356 public InventoryItemBase getInventoryItem(LLUUID itemID) 356 public InventoryItemBase getInventoryItem(UUID itemID)
357 { 357 {
358 try 358 try
359 { 359 {
@@ -389,9 +389,9 @@ namespace OpenSim.Data.MSSQL
389 try 389 try
390 { 390 {
391 InventoryFolderBase folder = new InventoryFolderBase(); 391 InventoryFolderBase folder = new InventoryFolderBase();
392 folder.Owner = new LLUUID((string) reader["agentID"]); 392 folder.Owner = new UUID((string) reader["agentID"]);
393 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 393 folder.ParentID = new UUID((string) reader["parentFolderID"]);
394 folder.ID = new LLUUID((string) reader["folderID"]); 394 folder.ID = new UUID((string) reader["folderID"]);
395 folder.Name = (string) reader["folderName"]; 395 folder.Name = (string) reader["folderName"];
396 folder.Type = (short) reader["type"]; 396 folder.Type = (short) reader["type"];
397 folder.Version = Convert.ToUInt16(reader["version"]); 397 folder.Version = Convert.ToUInt16(reader["version"]);
@@ -410,7 +410,7 @@ namespace OpenSim.Data.MSSQL
410 /// </summary> 410 /// </summary>
411 /// <param name="folder">The folder to return</param> 411 /// <param name="folder">The folder to return</param>
412 /// <returns>A folder class</returns> 412 /// <returns>A folder class</returns>
413 public InventoryFolderBase getInventoryFolder(LLUUID folderID) 413 public InventoryFolderBase getInventoryFolder(UUID folderID)
414 { 414 {
415 try 415 try
416 { 416 {
@@ -556,7 +556,7 @@ namespace OpenSim.Data.MSSQL
556 /// Delete an item in inventory database 556 /// Delete an item in inventory database
557 /// </summary> 557 /// </summary>
558 /// <param name="item">the item UUID</param> 558 /// <param name="item">the item UUID</param>
559 public void deleteInventoryItem(LLUUID itemID) 559 public void deleteInventoryItem(UUID itemID)
560 { 560 {
561 try 561 try
562 { 562 {
@@ -679,7 +679,7 @@ namespace OpenSim.Data.MSSQL
679 /// </summary> 679 /// </summary>
680 /// <param name="folders">list where folders will be appended</param> 680 /// <param name="folders">list where folders will be appended</param>
681 /// <param name="parentID">ID of parent</param> 681 /// <param name="parentID">ID of parent</param>
682 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 682 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
683 { 683 {
684 List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID); 684 List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID);
685 685
@@ -688,7 +688,7 @@ namespace OpenSim.Data.MSSQL
688 } 688 }
689 689
690 // See IInventoryDataPlugin 690 // See IInventoryDataPlugin
691 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 691 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
692 { 692 {
693 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 693 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
694 getInventoryFolders(ref folders, parentID); 694 getInventoryFolders(ref folders, parentID);
@@ -703,7 +703,7 @@ namespace OpenSim.Data.MSSQL
703 /// Delete a folder in inventory databasae 703 /// Delete a folder in inventory databasae
704 /// </summary> 704 /// </summary>
705 /// <param name="folderID">the folder UUID</param> 705 /// <param name="folderID">the folder UUID</param>
706 protected void deleteOneFolder(LLUUID folderID) 706 protected void deleteOneFolder(UUID folderID)
707 { 707 {
708 try 708 try
709 { 709 {
@@ -725,7 +725,7 @@ namespace OpenSim.Data.MSSQL
725 /// Delete an item in inventory database 725 /// Delete an item in inventory database
726 /// </summary> 726 /// </summary>
727 /// <param name="folderID">the item ID</param> 727 /// <param name="folderID">the item ID</param>
728 protected void deleteItemsInFolder(LLUUID folderID) 728 protected void deleteItemsInFolder(UUID folderID)
729 { 729 {
730 try 730 try
731 { 731 {
@@ -749,7 +749,7 @@ namespace OpenSim.Data.MSSQL
749 /// Delete an inventory folder 749 /// Delete an inventory folder
750 /// </summary> 750 /// </summary>
751 /// <param name="folderId">Id of folder to delete</param> 751 /// <param name="folderId">Id of folder to delete</param>
752 public void deleteInventoryFolder(LLUUID folderID) 752 public void deleteInventoryFolder(UUID folderID)
753 { 753 {
754 // lock (database) 754 // lock (database)
755 { 755 {
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 535cf33..abbcddf 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
@@ -220,7 +220,7 @@ namespace OpenSim.Data.MSSQL
220 { 220 {
221 return SqlDbType.Bit; 221 return SqlDbType.Bit;
222 } 222 }
223 if (type == typeof(LLUUID)) 223 if (type == typeof(UUID))
224 { 224 {
225 return SqlDbType.VarChar; 225 return SqlDbType.VarChar;
226 } 226 }
@@ -244,7 +244,7 @@ namespace OpenSim.Data.MSSQL
244 { 244 {
245 Type valueType = value.GetType(); 245 Type valueType = value.GetType();
246 246
247 if (valueType == typeof(LLUUID)) 247 if (valueType == typeof(UUID))
248 { 248 {
249 return value.ToString(); 249 return value.ToString();
250 } 250 }
@@ -335,7 +335,7 @@ namespace OpenSim.Data.MSSQL
335 // Region Main 335 // Region Main
336 regionprofile.regionHandle = Convert.ToUInt64(reader["regionHandle"]); 336 regionprofile.regionHandle = Convert.ToUInt64(reader["regionHandle"]);
337 regionprofile.regionName = (string)reader["regionName"]; 337 regionprofile.regionName = (string)reader["regionName"];
338 regionprofile.UUID = new LLUUID((string)reader["uuid"]); 338 regionprofile.UUID = new UUID((string)reader["uuid"]);
339 339
340 // Secrets 340 // Secrets
341 regionprofile.regionRecvKey = (string)reader["regionRecvKey"]; 341 regionprofile.regionRecvKey = (string)reader["regionRecvKey"];
@@ -372,16 +372,16 @@ namespace OpenSim.Data.MSSQL
372 regionprofile.regionUserURI = (string)reader["regionUserURI"]; 372 regionprofile.regionUserURI = (string)reader["regionUserURI"];
373 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"]; 373 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
374 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"]; 374 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
375 regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]); 375 regionprofile.owner_uuid = new UUID((string) reader["owner_uuid"]);
376 // World Map Addition 376 // World Map Addition
377 string tempRegionMap = reader["regionMapTexture"].ToString(); 377 string tempRegionMap = reader["regionMapTexture"].ToString();
378 if (tempRegionMap != String.Empty) 378 if (tempRegionMap != String.Empty)
379 { 379 {
380 regionprofile.regionMapTextureID = new LLUUID(tempRegionMap); 380 regionprofile.regionMapTextureID = new UUID(tempRegionMap);
381 } 381 }
382 else 382 else
383 { 383 {
384 regionprofile.regionMapTextureID = new LLUUID(); 384 regionprofile.regionMapTextureID = new UUID();
385 } 385 }
386 } 386 }
387 else 387 else
@@ -403,7 +403,7 @@ namespace OpenSim.Data.MSSQL
403 403
404 if (reader.Read()) 404 if (reader.Read())
405 { 405 {
406 retval.ID = new LLUUID((string)reader["UUID"]); 406 retval.ID = new UUID((string)reader["UUID"]);
407 retval.FirstName = (string)reader["username"]; 407 retval.FirstName = (string)reader["username"];
408 retval.SurName = (string)reader["lastname"]; 408 retval.SurName = (string)reader["lastname"];
409 409
@@ -411,11 +411,11 @@ namespace OpenSim.Data.MSSQL
411 retval.PasswordSalt = (string)reader["passwordSalt"]; 411 retval.PasswordSalt = (string)reader["passwordSalt"];
412 412
413 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 413 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
414 retval.HomeLocation = new LLVector3( 414 retval.HomeLocation = new Vector3(
415 Convert.ToSingle(reader["homeLocationX"].ToString()), 415 Convert.ToSingle(reader["homeLocationX"].ToString()),
416 Convert.ToSingle(reader["homeLocationY"].ToString()), 416 Convert.ToSingle(reader["homeLocationY"].ToString()),
417 Convert.ToSingle(reader["homeLocationZ"].ToString())); 417 Convert.ToSingle(reader["homeLocationZ"].ToString()));
418 retval.HomeLookAt = new LLVector3( 418 retval.HomeLookAt = new Vector3(
419 Convert.ToSingle(reader["homeLookAtX"].ToString()), 419 Convert.ToSingle(reader["homeLookAtX"].ToString()),
420 Convert.ToSingle(reader["homeLookAtY"].ToString()), 420 Convert.ToSingle(reader["homeLookAtY"].ToString()),
421 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 421 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
@@ -432,9 +432,9 @@ namespace OpenSim.Data.MSSQL
432 retval.AboutText = (string)reader["profileAboutText"]; 432 retval.AboutText = (string)reader["profileAboutText"];
433 retval.FirstLifeAboutText = (string)reader["profileFirstText"]; 433 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
434 434
435 retval.Image = new LLUUID((string)reader["profileImage"]); 435 retval.Image = new UUID((string)reader["profileImage"]);
436 retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]); 436 retval.FirstLifeImage = new UUID((string)reader["profileFirstImage"]);
437 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]); 437 retval.WebLoginKey = new UUID((string)reader["webLoginKey"]);
438 } 438 }
439 else 439 else
440 { 440 {
@@ -455,9 +455,9 @@ namespace OpenSim.Data.MSSQL
455 if (reader.Read()) 455 if (reader.Read())
456 { 456 {
457 // Agent IDs 457 // Agent IDs
458 retval.ProfileID = new LLUUID((string)reader["UUID"]); 458 retval.ProfileID = new UUID((string)reader["UUID"]);
459 retval.SessionID = new LLUUID((string)reader["sessionID"]); 459 retval.SessionID = new UUID((string)reader["sessionID"]);
460 retval.SecureSessionID = new LLUUID((string)reader["secureSessionID"]); 460 retval.SecureSessionID = new UUID((string)reader["secureSessionID"]);
461 461
462 // Agent Who? 462 // Agent Who?
463 retval.AgentIP = (string)reader["agentIP"]; 463 retval.AgentIP = (string)reader["agentIP"];
@@ -471,8 +471,8 @@ namespace OpenSim.Data.MSSQL
471 // Current position 471 // Current position
472 retval.Region = (string)reader["currentRegion"]; 472 retval.Region = (string)reader["currentRegion"];
473 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); 473 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
474 LLVector3 tmp_v; 474 Vector3 tmp_v;
475 LLVector3.TryParse((string)reader["currentPos"], out tmp_v); 475 Vector3.TryParse((string)reader["currentPos"], out tmp_v);
476 retval.Position = tmp_v; 476 retval.Position = tmp_v;
477 477
478 } 478 }
@@ -497,7 +497,7 @@ namespace OpenSim.Data.MSSQL
497 asset = new AssetBase(); 497 asset = new AssetBase();
498 asset.Data = (byte[])reader["data"]; 498 asset.Data = (byte[])reader["data"];
499 asset.Description = (string)reader["description"]; 499 asset.Description = (string)reader["description"];
500 asset.FullID = new LLUUID((string)reader["id"]); 500 asset.FullID = new UUID((string)reader["id"]);
501 asset.Local = Convert.ToBoolean(reader["local"]); // ((sbyte)reader["local"]) != 0 ? true : false; 501 asset.Local = Convert.ToBoolean(reader["local"]); // ((sbyte)reader["local"]) != 0 ? true : false;
502 asset.Name = (string)reader["name"]; 502 asset.Name = (string)reader["name"];
503 asset.Type = Convert.ToSByte(reader["assetType"]); 503 asset.Type = Convert.ToSByte(reader["assetType"]);
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 46aa6c9..d267e41 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
@@ -174,12 +174,12 @@ namespace OpenSim.Data.MSSQL
174 /// </summary> 174 /// </summary>
175 /// <param name="regionUUID">The region UUID.</param> 175 /// <param name="regionUUID">The region UUID.</param>
176 /// <returns></returns> 176 /// <returns></returns>
177 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 177 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
178 { 178 {
179 Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); 179 Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
180 180
181 //Retrieve all values of current region 181 //Retrieve all values of current region
182 RetrievePrimsDataForRegion(regionUUID, LLUUID.Zero, ""); 182 RetrievePrimsDataForRegion(regionUUID, UUID.Zero, "");
183 183
184 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); 184 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
185 185
@@ -235,7 +235,7 @@ namespace OpenSim.Data.MSSQL
235 "No shape found for prim in storage, so setting default box shape"); 235 "No shape found for prim in storage, so setting default box shape");
236 prim.Shape = PrimitiveBaseShape.Default; 236 prim.Shape = PrimitiveBaseShape.Default;
237 } 237 }
238 createdObjects[new LLUUID(objID)].AddPart(prim); 238 createdObjects[new UUID(objID)].AddPart(prim);
239 } 239 }
240 240
241 LoadItems(prim); 241 LoadItems(prim);
@@ -292,7 +292,7 @@ namespace OpenSim.Data.MSSQL
292// } 292// }
293// else 293// else
294// { 294// {
295// createdObjects[new LLUUID(objID)].AddPart(prim); 295// createdObjects[new UUID(objID)].AddPart(prim);
296// } 296// }
297// } 297// }
298// } 298// }
@@ -307,7 +307,7 @@ namespace OpenSim.Data.MSSQL
307// { 307// {
308// while (readerShapes.Read()) 308// while (readerShapes.Read())
309// { 309// {
310// LLUUID UUID = new LLUUID((string) readerShapes["UUID"]); 310// UUID UUID = new UUID((string) readerShapes["UUID"]);
311// 311//
312// foreach (SceneObjectGroup objectGroup in createdObjects.Values) 312// foreach (SceneObjectGroup objectGroup in createdObjects.Values)
313// { 313// {
@@ -324,7 +324,7 @@ namespace OpenSim.Data.MSSQL
324 #endregion 324 #endregion
325 } 325 }
326 326
327 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 327 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
328 { 328 {
329 //Retrieve all values of current region, and current scene/or prims 329 //Retrieve all values of current region, and current scene/or prims
330 //Build primID's, we use IN so I can select all prims from objgroup 330 //Build primID's, we use IN so I can select all prims from objgroup
@@ -341,9 +341,9 @@ namespace OpenSim.Data.MSSQL
341 341
342 foreach (SceneObjectPart prim in obj.Children.Values) 342 foreach (SceneObjectPart prim in obj.Children.Values)
343 { 343 {
344 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0 344 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
345 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 345 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
346 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) 346 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
347 { 347 {
348 lock (_PrimsDataSet) 348 lock (_PrimsDataSet)
349 { 349 {
@@ -391,7 +391,7 @@ namespace OpenSim.Data.MSSQL
391 /// </summary> 391 /// </summary>
392 /// <param name="objectID">id of scenegroup</param> 392 /// <param name="objectID">id of scenegroup</param>
393 /// <param name="regionUUID">regionUUID (is this used anyway</param> 393 /// <param name="regionUUID">regionUUID (is this used anyway</param>
394 public void RemoveObject(LLUUID objectID, LLUUID regionUUID) 394 public void RemoveObject(UUID objectID, UUID regionUUID)
395 { 395 {
396 _Log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", objectID, regionUUID); 396 _Log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", objectID, regionUUID);
397 397
@@ -418,7 +418,7 @@ namespace OpenSim.Data.MSSQL
418 /// </summary> 418 /// </summary>
419 /// <param name="primID"></param> 419 /// <param name="primID"></param>
420 /// <param name="items"></param> 420 /// <param name="items"></param>
421 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 421 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
422 { 422 {
423 _Log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); 423 _Log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
424 424
@@ -456,7 +456,7 @@ namespace OpenSim.Data.MSSQL
456 /// </summary> 456 /// </summary>
457 /// <param name="regionID">regionID.</param> 457 /// <param name="regionID">regionID.</param>
458 /// <returns></returns> 458 /// <returns></returns>
459 public double[,] LoadTerrain(LLUUID regionID) 459 public double[,] LoadTerrain(UUID regionID)
460 { 460 {
461 double[,] terrain = new double[256, 256]; 461 double[,] terrain = new double[256, 256];
462 terrain.Initialize(); 462 terrain.Initialize();
@@ -501,7 +501,7 @@ namespace OpenSim.Data.MSSQL
501 /// </summary> 501 /// </summary>
502 /// <param name="terrain">terrain map data.</param> 502 /// <param name="terrain">terrain map data.</param>
503 /// <param name="regionID">regionID.</param> 503 /// <param name="regionID">regionID.</param>
504 public void StoreTerrain(double[,] terrain, LLUUID regionID) 504 public void StoreTerrain(double[,] terrain, UUID regionID)
505 { 505 {
506 int revision = Util.UnixTimeSinceEpoch(); 506 int revision = Util.UnixTimeSinceEpoch();
507 507
@@ -532,7 +532,7 @@ namespace OpenSim.Data.MSSQL
532 /// </summary> 532 /// </summary>
533 /// <param name="regionUUID">The region UUID.</param> 533 /// <param name="regionUUID">The region UUID.</param>
534 /// <returns></returns> 534 /// <returns></returns>
535 public List<LandData> LoadLandObjects(LLUUID regionUUID) 535 public List<LandData> LoadLandObjects(UUID regionUUID)
536 { 536 {
537 List<LandData> landDataForRegion = new List<LandData>(); 537 List<LandData> landDataForRegion = new List<LandData>();
538 538
@@ -617,7 +617,7 @@ VALUES
617 /// Removes a land object from DB. 617 /// Removes a land object from DB.
618 /// </summary> 618 /// </summary>
619 /// <param name="globalID">UUID of landobject</param> 619 /// <param name="globalID">UUID of landobject</param>
620 public void RemoveLandObject(LLUUID globalID) 620 public void RemoveLandObject(UUID globalID)
621 { 621 {
622 using (AutoClosingSqlCommand cmd = _Database.Query("delete from land where UUID=@UUID")) 622 using (AutoClosingSqlCommand cmd = _Database.Query("delete from land where UUID=@UUID"))
623 { 623 {
@@ -637,7 +637,7 @@ VALUES
637 /// </summary> 637 /// </summary>
638 /// <param name="regionUUID">The region UUID.</param> 638 /// <param name="regionUUID">The region UUID.</param>
639 /// <returns></returns> 639 /// <returns></returns>
640 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 640 public RegionSettings LoadRegionSettings(UUID regionUUID)
641 { 641 {
642 string sql = "select * from regionsettings where regionUUID = @regionUUID"; 642 string sql = "select * from regionsettings where regionUUID = @regionUUID";
643 RegionSettings regionSettings; 643 RegionSettings regionSettings;
@@ -801,7 +801,7 @@ VALUES
801 //TODO change this is some more generic code so we doesnt have to change it every time a new field is added? 801 //TODO change this is some more generic code so we doesnt have to change it every time a new field is added?
802 RegionSettings newSettings = new RegionSettings(); 802 RegionSettings newSettings = new RegionSettings();
803 803
804 newSettings.RegionUUID = new LLUUID((string)row["regionUUID"]); 804 newSettings.RegionUUID = new UUID((string)row["regionUUID"]);
805 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]); 805 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
806 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]); 806 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
807 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]); 807 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
@@ -815,10 +815,10 @@ VALUES
815 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]); 815 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
816 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]); 816 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
817 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]); 817 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
818 newSettings.TerrainTexture1 = new LLUUID((String)row["terrain_texture_1"]); 818 newSettings.TerrainTexture1 = new UUID((String)row["terrain_texture_1"]);
819 newSettings.TerrainTexture2 = new LLUUID((String)row["terrain_texture_2"]); 819 newSettings.TerrainTexture2 = new UUID((String)row["terrain_texture_2"]);
820 newSettings.TerrainTexture3 = new LLUUID((String)row["terrain_texture_3"]); 820 newSettings.TerrainTexture3 = new UUID((String)row["terrain_texture_3"]);
821 newSettings.TerrainTexture4 = new LLUUID((String)row["terrain_texture_4"]); 821 newSettings.TerrainTexture4 = new UUID((String)row["terrain_texture_4"]);
822 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]); 822 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
823 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]); 823 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
824 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]); 824 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
@@ -834,7 +834,7 @@ VALUES
834 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); 834 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
835 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); 835 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
836 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); 836 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
837 newSettings.Covenant = new LLUUID((String)row["covenant"]); 837 newSettings.Covenant = new UUID((String)row["covenant"]);
838 838
839 return newSettings; 839 return newSettings;
840 } 840 }
@@ -848,7 +848,7 @@ VALUES
848 { 848 {
849 LandData newData = new LandData(); 849 LandData newData = new LandData();
850 850
851 newData.GlobalID = new LLUUID((String)row["UUID"]); 851 newData.GlobalID = new UUID((String)row["UUID"]);
852 newData.LocalID = Convert.ToInt32(row["LocalLandID"]); 852 newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
853 853
854 // Bitmap is a byte[512] 854 // Bitmap is a byte[512]
@@ -864,41 +864,41 @@ VALUES
864 //Enum libsecondlife.Parcel.ParcelCategory 864 //Enum libsecondlife.Parcel.ParcelCategory
865 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 865 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
866 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 866 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
867 newData.GroupID = new LLUUID((String)row["GroupUUID"]); 867 newData.GroupID = new UUID((String)row["GroupUUID"]);
868 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 868 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
869 newData.Status = (Parcel.ParcelStatus)Convert.ToInt32(row["LandStatus"]); 869 newData.Status = (Parcel.ParcelStatus)Convert.ToInt32(row["LandStatus"]);
870 //Enum. libsecondlife.Parcel.ParcelStatus 870 //Enum. libsecondlife.Parcel.ParcelStatus
871 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 871 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
872 newData.LandingType = Convert.ToByte(row["LandingType"]); 872 newData.LandingType = Convert.ToByte(row["LandingType"]);
873 newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]); 873 newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
874 newData.MediaID = new LLUUID((String)row["MediaTextureUUID"]); 874 newData.MediaID = new UUID((String)row["MediaTextureUUID"]);
875 newData.MediaURL = (String)row["MediaURL"]; 875 newData.MediaURL = (String)row["MediaURL"];
876 newData.MusicURL = (String)row["MusicURL"]; 876 newData.MusicURL = (String)row["MusicURL"];
877 newData.PassHours = Convert.ToSingle(row["PassHours"]); 877 newData.PassHours = Convert.ToSingle(row["PassHours"]);
878 newData.PassPrice = Convert.ToInt32(row["PassPrice"]); 878 newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
879 879
880 LLUUID authedbuyer; 880 UUID authedbuyer;
881 LLUUID snapshotID; 881 UUID snapshotID;
882 882
883 if (LLUUID.TryParse((string)row["AuthBuyerID"], out authedbuyer)) 883 if (UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer))
884 newData.AuthBuyerID = authedbuyer; 884 newData.AuthBuyerID = authedbuyer;
885 885
886 if (LLUUID.TryParse((string)row["SnapshotUUID"], out snapshotID)) 886 if (UUID.TryParse((string)row["SnapshotUUID"], out snapshotID))
887 newData.SnapshotID = snapshotID; 887 newData.SnapshotID = snapshotID;
888 888
889 try 889 try
890 { 890 {
891 newData.UserLocation = 891 newData.UserLocation =
892 new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), 892 new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
893 Convert.ToSingle(row["UserLocationZ"])); 893 Convert.ToSingle(row["UserLocationZ"]));
894 newData.UserLookAt = 894 newData.UserLookAt =
895 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), 895 new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
896 Convert.ToSingle(row["UserLookAtZ"])); 896 Convert.ToSingle(row["UserLookAtZ"]));
897 } 897 }
898 catch (InvalidCastException) 898 catch (InvalidCastException)
899 { 899 {
900 newData.UserLocation = LLVector3.Zero; 900 newData.UserLocation = Vector3.Zero;
901 newData.UserLookAt = LLVector3.Zero; 901 newData.UserLookAt = Vector3.Zero;
902 _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 902 _Log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
903 } 903 }
904 904
@@ -915,7 +915,7 @@ VALUES
915 private static ParcelManager.ParcelAccessEntry buildLandAccessData(IDataRecord row) 915 private static ParcelManager.ParcelAccessEntry buildLandAccessData(IDataRecord row)
916 { 916 {
917 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 917 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
918 entry.AgentID = new LLUUID((string)row["AccessUUID"]); 918 entry.AgentID = new UUID((string)row["AccessUUID"]);
919 entry.Flags = (ParcelManager.AccessList)Convert.ToInt32(row["Flags"]); 919 entry.Flags = (ParcelManager.AccessList)Convert.ToInt32(row["Flags"]);
920 entry.Time = new DateTime(); 920 entry.Time = new DateTime();
921 return entry; 921 return entry;
@@ -930,7 +930,7 @@ VALUES
930 { 930 {
931 SceneObjectPart prim = new SceneObjectPart(); 931 SceneObjectPart prim = new SceneObjectPart();
932 932
933 prim.UUID = new LLUUID((String)row["UUID"]); 933 prim.UUID = new UUID((String)row["UUID"]);
934 // explicit conversion of integers is required, which sort 934 // explicit conversion of integers is required, which sort
935 // of sucks. No idea if there is a shortcut here or not. 935 // of sucks. No idea if there is a shortcut here or not.
936 prim.ParentID = Convert.ToUInt32(row["ParentID"]); 936 prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -943,54 +943,54 @@ VALUES
943 prim.TouchName = (String)row["TouchName"]; 943 prim.TouchName = (String)row["TouchName"];
944 // permissions 944 // permissions
945 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 945 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
946 prim.CreatorID = new LLUUID((String)row["CreatorID"]); 946 prim.CreatorID = new UUID((String)row["CreatorID"]);
947 prim.OwnerID = new LLUUID((String)row["OwnerID"]); 947 prim.OwnerID = new UUID((String)row["OwnerID"]);
948 prim.GroupID = new LLUUID((String)row["GroupID"]); 948 prim.GroupID = new UUID((String)row["GroupID"]);
949 prim.LastOwnerID = new LLUUID((String)row["LastOwnerID"]); 949 prim.LastOwnerID = new UUID((String)row["LastOwnerID"]);
950 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); 950 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
951 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); 951 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
952 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); 952 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
953 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]); 953 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
954 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); 954 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
955 // vectors 955 // vectors
956 prim.OffsetPosition = new LLVector3( 956 prim.OffsetPosition = new Vector3(
957 Convert.ToSingle(row["PositionX"]), 957 Convert.ToSingle(row["PositionX"]),
958 Convert.ToSingle(row["PositionY"]), 958 Convert.ToSingle(row["PositionY"]),
959 Convert.ToSingle(row["PositionZ"]) 959 Convert.ToSingle(row["PositionZ"])
960 ); 960 );
961 prim.GroupPosition = new LLVector3( 961 prim.GroupPosition = new Vector3(
962 Convert.ToSingle(row["GroupPositionX"]), 962 Convert.ToSingle(row["GroupPositionX"]),
963 Convert.ToSingle(row["GroupPositionY"]), 963 Convert.ToSingle(row["GroupPositionY"]),
964 Convert.ToSingle(row["GroupPositionZ"]) 964 Convert.ToSingle(row["GroupPositionZ"])
965 ); 965 );
966 prim.Velocity = new LLVector3( 966 prim.Velocity = new Vector3(
967 Convert.ToSingle(row["VelocityX"]), 967 Convert.ToSingle(row["VelocityX"]),
968 Convert.ToSingle(row["VelocityY"]), 968 Convert.ToSingle(row["VelocityY"]),
969 Convert.ToSingle(row["VelocityZ"]) 969 Convert.ToSingle(row["VelocityZ"])
970 ); 970 );
971 prim.AngularVelocity = new LLVector3( 971 prim.AngularVelocity = new Vector3(
972 Convert.ToSingle(row["AngularVelocityX"]), 972 Convert.ToSingle(row["AngularVelocityX"]),
973 Convert.ToSingle(row["AngularVelocityY"]), 973 Convert.ToSingle(row["AngularVelocityY"]),
974 Convert.ToSingle(row["AngularVelocityZ"]) 974 Convert.ToSingle(row["AngularVelocityZ"])
975 ); 975 );
976 prim.Acceleration = new LLVector3( 976 prim.Acceleration = new Vector3(
977 Convert.ToSingle(row["AccelerationX"]), 977 Convert.ToSingle(row["AccelerationX"]),
978 Convert.ToSingle(row["AccelerationY"]), 978 Convert.ToSingle(row["AccelerationY"]),
979 Convert.ToSingle(row["AccelerationZ"]) 979 Convert.ToSingle(row["AccelerationZ"])
980 ); 980 );
981 // quaternions 981 // quaternions
982 prim.RotationOffset = new LLQuaternion( 982 prim.RotationOffset = new Quaternion(
983 Convert.ToSingle(row["RotationX"]), 983 Convert.ToSingle(row["RotationX"]),
984 Convert.ToSingle(row["RotationY"]), 984 Convert.ToSingle(row["RotationY"]),
985 Convert.ToSingle(row["RotationZ"]), 985 Convert.ToSingle(row["RotationZ"]),
986 Convert.ToSingle(row["RotationW"]) 986 Convert.ToSingle(row["RotationW"])
987 ); 987 );
988 prim.SitTargetPositionLL = new LLVector3( 988 prim.SitTargetPositionLL = new Vector3(
989 Convert.ToSingle(row["SitTargetOffsetX"]), 989 Convert.ToSingle(row["SitTargetOffsetX"]),
990 Convert.ToSingle(row["SitTargetOffsetY"]), 990 Convert.ToSingle(row["SitTargetOffsetY"]),
991 Convert.ToSingle(row["SitTargetOffsetZ"]) 991 Convert.ToSingle(row["SitTargetOffsetZ"])
992 ); 992 );
993 prim.SitTargetOrientationLL = new LLQuaternion( 993 prim.SitTargetOrientationLL = new Quaternion(
994 Convert.ToSingle(row["SitTargetOrientX"]), 994 Convert.ToSingle(row["SitTargetOrientX"]),
995 Convert.ToSingle(row["SitTargetOrientY"]), 995 Convert.ToSingle(row["SitTargetOrientY"]),
996 Convert.ToSingle(row["SitTargetOrientZ"]), 996 Convert.ToSingle(row["SitTargetOrientZ"]),
@@ -1003,14 +1003,14 @@ VALUES
1003 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]); 1003 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
1004 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]); 1004 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
1005 1005
1006 prim.Sound = new LLUUID(row["LoopedSound"].ToString()); 1006 prim.Sound = new UUID(row["LoopedSound"].ToString());
1007 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]); 1007 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
1008 prim.SoundFlags = 1; // If it's persisted at all, it's looped 1008 prim.SoundFlags = 1; // If it's persisted at all, it's looped
1009 1009
1010 if (row["TextureAnimation"] != null && row["TextureAnimation"] != DBNull.Value) 1010 if (row["TextureAnimation"] != null && row["TextureAnimation"] != DBNull.Value)
1011 prim.TextureAnimation = (Byte[])row["TextureAnimation"]; 1011 prim.TextureAnimation = (Byte[])row["TextureAnimation"];
1012 1012
1013 prim.RotationalVelocity = new LLVector3( 1013 prim.RotationalVelocity = new Vector3(
1014 Convert.ToSingle(row["OmegaX"]), 1014 Convert.ToSingle(row["OmegaX"]),
1015 Convert.ToSingle(row["OmegaY"]), 1015 Convert.ToSingle(row["OmegaY"]),
1016 Convert.ToSingle(row["OmegaZ"]) 1016 Convert.ToSingle(row["OmegaZ"])
@@ -1019,13 +1019,13 @@ VALUES
1019 // TODO: Rotation 1019 // TODO: Rotation
1020 // OmegaX, OmegaY, OmegaZ 1020 // OmegaX, OmegaY, OmegaZ
1021 1021
1022 prim.SetCameraEyeOffset(new LLVector3( 1022 prim.SetCameraEyeOffset(new Vector3(
1023 Convert.ToSingle(row["CameraEyeOffsetX"]), 1023 Convert.ToSingle(row["CameraEyeOffsetX"]),
1024 Convert.ToSingle(row["CameraEyeOffsetY"]), 1024 Convert.ToSingle(row["CameraEyeOffsetY"]),
1025 Convert.ToSingle(row["CameraEyeOffsetZ"]) 1025 Convert.ToSingle(row["CameraEyeOffsetZ"])
1026 )); 1026 ));
1027 1027
1028 prim.SetCameraAtOffset(new LLVector3( 1028 prim.SetCameraAtOffset(new Vector3(
1029 Convert.ToSingle(row["CameraAtOffsetX"]), 1029 Convert.ToSingle(row["CameraAtOffsetX"]),
1030 Convert.ToSingle(row["CameraAtOffsetY"]), 1030 Convert.ToSingle(row["CameraAtOffsetY"]),
1031 Convert.ToSingle(row["CameraAtOffsetZ"]) 1031 Convert.ToSingle(row["CameraAtOffsetZ"])
@@ -1056,7 +1056,7 @@ VALUES
1056 private static PrimitiveBaseShape buildShape(DataRow row) 1056 private static PrimitiveBaseShape buildShape(DataRow row)
1057 { 1057 {
1058 PrimitiveBaseShape s = new PrimitiveBaseShape(); 1058 PrimitiveBaseShape s = new PrimitiveBaseShape();
1059 s.Scale = new LLVector3( 1059 s.Scale = new Vector3(
1060 Convert.ToSingle(row["ScaleX"]), 1060 Convert.ToSingle(row["ScaleX"]),
1061 Convert.ToSingle(row["ScaleY"]), 1061 Convert.ToSingle(row["ScaleY"]),
1062 Convert.ToSingle(row["ScaleZ"]) 1062 Convert.ToSingle(row["ScaleZ"])
@@ -1108,10 +1108,10 @@ VALUES
1108 { 1108 {
1109 TaskInventoryItem taskItem = new TaskInventoryItem(); 1109 TaskInventoryItem taskItem = new TaskInventoryItem();
1110 1110
1111 taskItem.ItemID = new LLUUID((String)row["itemID"]); 1111 taskItem.ItemID = new UUID((String)row["itemID"]);
1112 taskItem.ParentPartID = new LLUUID((String)row["primID"]); 1112 taskItem.ParentPartID = new UUID((String)row["primID"]);
1113 taskItem.AssetID = new LLUUID((String)row["assetID"]); 1113 taskItem.AssetID = new UUID((String)row["assetID"]);
1114 taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); 1114 taskItem.ParentID = new UUID((String)row["parentFolderID"]);
1115 1115
1116 taskItem.InvType = Convert.ToInt32(row["invType"]); 1116 taskItem.InvType = Convert.ToInt32(row["invType"]);
1117 taskItem.Type = Convert.ToInt32(row["assetType"]); 1117 taskItem.Type = Convert.ToInt32(row["assetType"]);
@@ -1119,10 +1119,10 @@ VALUES
1119 taskItem.Name = (String)row["name"]; 1119 taskItem.Name = (String)row["name"];
1120 taskItem.Description = (String)row["description"]; 1120 taskItem.Description = (String)row["description"];
1121 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1121 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1122 taskItem.CreatorID = new LLUUID((String)row["creatorID"]); 1122 taskItem.CreatorID = new UUID((String)row["creatorID"]);
1123 taskItem.OwnerID = new LLUUID((String)row["ownerID"]); 1123 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1124 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1124 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1125 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1125 taskItem.GroupID = new UUID((String)row["groupID"]);
1126 1126
1127 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); 1127 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1128 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); 1128 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
@@ -1225,7 +1225,7 @@ VALUES
1225 /// <param name="land">land parameters.</param> 1225 /// <param name="land">land parameters.</param>
1226 /// <param name="regionUUID">region UUID.</param> 1226 /// <param name="regionUUID">region UUID.</param>
1227 /// <returns></returns> 1227 /// <returns></returns>
1228 private SqlParameter[] CreateLandParameters(LandData land, LLUUID regionUUID) 1228 private SqlParameter[] CreateLandParameters(LandData land, UUID regionUUID)
1229 { 1229 {
1230 SqlParameter[] parameters = new SqlParameter[32]; 1230 SqlParameter[] parameters = new SqlParameter[32];
1231 1231
@@ -1274,7 +1274,7 @@ VALUES
1274 /// <param name="parcelAccessEntry">parcel access entry.</param> 1274 /// <param name="parcelAccessEntry">parcel access entry.</param>
1275 /// <param name="parcelID">parcel ID.</param> 1275 /// <param name="parcelID">parcel ID.</param>
1276 /// <returns></returns> 1276 /// <returns></returns>
1277 private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, LLUUID parcelID) 1277 private SqlParameter[] CreateLandAccessParameters(ParcelManager.ParcelAccessEntry parcelAccessEntry, UUID parcelID)
1278 { 1278 {
1279 SqlParameter[] parameters = new SqlParameter[3]; 1279 SqlParameter[] parameters = new SqlParameter[3];
1280 1280
@@ -1292,7 +1292,7 @@ VALUES
1292 /// <param name="prim">prim data.</param> 1292 /// <param name="prim">prim data.</param>
1293 /// <param name="sceneGroupID">scenegroup ID.</param> 1293 /// <param name="sceneGroupID">scenegroup ID.</param>
1294 /// <param name="regionUUID">regionUUID.</param> 1294 /// <param name="regionUUID">regionUUID.</param>
1295 private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1295 private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1296 { 1296 {
1297 row["UUID"] = prim.UUID.ToString(); 1297 row["UUID"] = prim.UUID.ToString();
1298 row["RegionUUID"] = regionUUID.ToString(); 1298 row["RegionUUID"] = regionUUID.ToString();
@@ -1340,12 +1340,12 @@ VALUES
1340 row["RotationW"] = prim.RotationOffset.W; 1340 row["RotationW"] = prim.RotationOffset.W;
1341 1341
1342 // Sit target 1342 // Sit target
1343 LLVector3 sitTargetPos = prim.SitTargetPositionLL; 1343 Vector3 sitTargetPos = prim.SitTargetPositionLL;
1344 row["SitTargetOffsetX"] = sitTargetPos.X; 1344 row["SitTargetOffsetX"] = sitTargetPos.X;
1345 row["SitTargetOffsetY"] = sitTargetPos.Y; 1345 row["SitTargetOffsetY"] = sitTargetPos.Y;
1346 row["SitTargetOffsetZ"] = sitTargetPos.Z; 1346 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1347 1347
1348 LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; 1348 Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
1349 row["SitTargetOrientW"] = sitTargetOrient.W; 1349 row["SitTargetOrientW"] = sitTargetOrient.W;
1350 row["SitTargetOrientX"] = sitTargetOrient.X; 1350 row["SitTargetOrientX"] = sitTargetOrient.X;
1351 row["SitTargetOrientY"] = sitTargetOrient.Y; 1351 row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1364,7 +1364,7 @@ VALUES
1364 } 1364 }
1365 else 1365 else
1366 { 1366 {
1367 row["LoopedSound"] = LLUUID.Zero; 1367 row["LoopedSound"] = UUID.Zero;
1368 row["LoopedSoundGain"] = 0.0f; 1368 row["LoopedSoundGain"] = 0.0f;
1369 } 1369 }
1370 1370
@@ -1446,13 +1446,13 @@ VALUES
1446 1446
1447 #endregion 1447 #endregion
1448 1448
1449 private void RetrievePrimsDataForRegion(LLUUID regionUUID, LLUUID sceneGroupID, string primID) 1449 private void RetrievePrimsDataForRegion(UUID regionUUID, UUID sceneGroupID, string primID)
1450 { 1450 {
1451 using (SqlConnection connection = _Database.DatabaseConnection()) 1451 using (SqlConnection connection = _Database.DatabaseConnection())
1452 { 1452 {
1453 _PrimDataAdapter.SelectCommand.Connection = connection; 1453 _PrimDataAdapter.SelectCommand.Connection = connection;
1454 _PrimDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString(); 1454 _PrimDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString();
1455 if (sceneGroupID != LLUUID.Zero) 1455 if (sceneGroupID != UUID.Zero)
1456 _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString(); 1456 _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString();
1457 else 1457 else
1458 _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%"; 1458 _PrimDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%";
@@ -1462,7 +1462,7 @@ VALUES
1462 1462
1463 _ShapeDataAdapter.SelectCommand.Connection = connection; 1463 _ShapeDataAdapter.SelectCommand.Connection = connection;
1464 _ShapeDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString(); 1464 _ShapeDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString();
1465 if (sceneGroupID != LLUUID.Zero) 1465 if (sceneGroupID != UUID.Zero)
1466 _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString(); 1466 _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString();
1467 else 1467 else
1468 _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%"; 1468 _ShapeDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%";
@@ -1472,7 +1472,7 @@ VALUES
1472 1472
1473 _ItemsDataAdapter.SelectCommand.Connection = connection; 1473 _ItemsDataAdapter.SelectCommand.Connection = connection;
1474 _ItemsDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString(); 1474 _ItemsDataAdapter.SelectCommand.Parameters["@RegionUUID"].Value = regionUUID.ToString();
1475 if (sceneGroupID != LLUUID.Zero) 1475 if (sceneGroupID != UUID.Zero)
1476 _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString(); 1476 _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = sceneGroupID.ToString();
1477 else 1477 else
1478 _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%"; 1478 _ItemsDataAdapter.SelectCommand.Parameters["@SceneGroupID"].Value = "%";
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index cfe5f50..9118012 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -183,13 +183,13 @@ namespace OpenSim.Data.MSSQL
183 /// <param name="friendlistowner">UUID of the friendlist owner</param> 183 /// <param name="friendlistowner">UUID of the friendlist owner</param>
184 /// <param name="friend">Friend's UUID</param> 184 /// <param name="friend">Friend's UUID</param>
185 /// <param name="perms">Permission flag</param> 185 /// <param name="perms">Permission flag</param>
186 override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 186 override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
187 { 187 {
188 int dtvalue = Util.UnixTimeSinceEpoch(); 188 int dtvalue = Util.UnixTimeSinceEpoch();
189 189
190 Dictionary<string, string> param = new Dictionary<string, string>(); 190 Dictionary<string, string> param = new Dictionary<string, string>();
191 param["@ownerID"] = friendlistowner.UUID.ToString(); 191 param["@ownerID"] = friendlistowner.ToString();
192 param["@friendID"] = friend.UUID.ToString(); 192 param["@friendID"] = friend.ToString();
193 param["@friendPerms"] = perms.ToString(); 193 param["@friendPerms"] = perms.ToString();
194 param["@datetimestamp"] = dtvalue.ToString(); 194 param["@datetimestamp"] = dtvalue.ToString();
195 195
@@ -229,11 +229,11 @@ namespace OpenSim.Data.MSSQL
229 /// </summary> 229 /// </summary>
230 /// <param name="friendlistowner">UUID of the friendlist owner</param> 230 /// <param name="friendlistowner">UUID of the friendlist owner</param>
231 /// <param name="friend">UUID of the not-so-friendly user to remove from the list</param> 231 /// <param name="friend">UUID of the not-so-friendly user to remove from the list</param>
232 override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 232 override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
233 { 233 {
234 Dictionary<string, string> param = new Dictionary<string, string>(); 234 Dictionary<string, string> param = new Dictionary<string, string>();
235 param["@ownerID"] = friendlistowner.UUID.ToString(); 235 param["@ownerID"] = friendlistowner.ToString();
236 param["@friendID"] = friend.UUID.ToString(); 236 param["@friendID"] = friend.ToString();
237 237
238 238
239 try 239 try
@@ -267,11 +267,11 @@ namespace OpenSim.Data.MSSQL
267 /// <param name="friendlistowner">UUID of the friendlist owner</param> 267 /// <param name="friendlistowner">UUID of the friendlist owner</param>
268 /// <param name="friend">UUID of the friend</param> 268 /// <param name="friend">UUID of the friend</param>
269 /// <param name="perms">new permission flag</param> 269 /// <param name="perms">new permission flag</param>
270 override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 270 override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
271 { 271 {
272 Dictionary<string, string> param = new Dictionary<string, string>(); 272 Dictionary<string, string> param = new Dictionary<string, string>();
273 param["@ownerID"] = friendlistowner.UUID.ToString(); 273 param["@ownerID"] = friendlistowner.ToString();
274 param["@friendID"] = friend.UUID.ToString(); 274 param["@friendID"] = friend.ToString();
275 param["@friendPerms"] = perms.ToString(); 275 param["@friendPerms"] = perms.ToString();
276 276
277 277
@@ -298,12 +298,12 @@ namespace OpenSim.Data.MSSQL
298 /// </summary> 298 /// </summary>
299 /// <param name="friendlistowner">UUID of the friendlist owner</param> 299 /// <param name="friendlistowner">UUID of the friendlist owner</param>
300 /// <returns>Friendlist list</returns> 300 /// <returns>Friendlist list</returns>
301 override public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 301 override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
302 { 302 {
303 List<FriendListItem> Lfli = new List<FriendListItem>(); 303 List<FriendListItem> Lfli = new List<FriendListItem>();
304 304
305 Dictionary<string, string> param = new Dictionary<string, string>(); 305 Dictionary<string, string> param = new Dictionary<string, string>();
306 param["@ownerID"] = friendlistowner.UUID.ToString(); 306 param["@ownerID"] = friendlistowner.ToString();
307 307
308 try 308 try
309 { 309 {
@@ -318,8 +318,8 @@ namespace OpenSim.Data.MSSQL
318 while (reader.Read()) 318 while (reader.Read())
319 { 319 {
320 FriendListItem fli = new FriendListItem(); 320 FriendListItem fli = new FriendListItem();
321 fli.FriendListOwner = new LLUUID((string)reader["ownerID"]); 321 fli.FriendListOwner = new UUID((string)reader["ownerID"]);
322 fli.Friend = new LLUUID((string)reader["friendID"]); 322 fli.Friend = new UUID((string)reader["friendID"]);
323 fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]); 323 fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]);
324 324
325 // This is not a real column in the database table, it's a joined column from the opposite record 325 // This is not a real column in the database table, it's a joined column from the opposite record
@@ -345,7 +345,7 @@ namespace OpenSim.Data.MSSQL
345 /// <param name="avatarid">avatar uuid</param> 345 /// <param name="avatarid">avatar uuid</param>
346 /// <param name="regionuuid">region uuid</param> 346 /// <param name="regionuuid">region uuid</param>
347 /// <param name="regionhandle">region handle</param> 347 /// <param name="regionhandle">region handle</param>
348 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 348 override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
349 { 349 {
350 //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); 350 //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
351 } 351 }
@@ -356,7 +356,7 @@ namespace OpenSim.Data.MSSQL
356 /// <param name="queryID"></param> 356 /// <param name="queryID"></param>
357 /// <param name="query"></param> 357 /// <param name="query"></param>
358 /// <returns></returns> 358 /// <returns></returns>
359 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 359 override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
360 { 360 {
361 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 361 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
362 string[] querysplit; 362 string[] querysplit;
@@ -375,7 +375,7 @@ namespace OpenSim.Data.MSSQL
375 while (reader.Read()) 375 while (reader.Read())
376 { 376 {
377 AvatarPickerAvatar user = new AvatarPickerAvatar(); 377 AvatarPickerAvatar user = new AvatarPickerAvatar();
378 user.AvatarID = new LLUUID((string)reader["UUID"]); 378 user.AvatarID = new UUID((string)reader["UUID"]);
379 user.firstName = (string)reader["username"]; 379 user.firstName = (string)reader["username"];
380 user.lastName = (string)reader["lastname"]; 380 user.lastName = (string)reader["lastname"];
381 returnlist.Add(user); 381 returnlist.Add(user);
@@ -400,7 +400,7 @@ namespace OpenSim.Data.MSSQL
400 while (reader.Read()) 400 while (reader.Read())
401 { 401 {
402 AvatarPickerAvatar user = new AvatarPickerAvatar(); 402 AvatarPickerAvatar user = new AvatarPickerAvatar();
403 user.AvatarID = new LLUUID((string)reader["UUID"]); 403 user.AvatarID = new UUID((string)reader["UUID"]);
404 user.firstName = (string)reader["username"]; 404 user.firstName = (string)reader["username"];
405 user.lastName = (string)reader["lastname"]; 405 user.lastName = (string)reader["lastname"];
406 returnlist.Add(user); 406 returnlist.Add(user);
@@ -420,7 +420,7 @@ namespace OpenSim.Data.MSSQL
420 /// </summary> 420 /// </summary>
421 /// <param name="uuid"></param> 421 /// <param name="uuid"></param>
422 /// <returns></returns> 422 /// <returns></returns>
423 override public UserProfileData GetUserByUUID(LLUUID uuid) 423 override public UserProfileData GetUserByUUID(UUID uuid)
424 { 424 {
425 try 425 try
426 { 426 {
@@ -467,7 +467,7 @@ namespace OpenSim.Data.MSSQL
467 /// </summary> 467 /// </summary>
468 /// <param name="uuid">The accounts UUID</param> 468 /// <param name="uuid">The accounts UUID</param>
469 /// <returns>The users session</returns> 469 /// <returns>The users session</returns>
470 override public UserAgentData GetAgentByUUID(LLUUID uuid) 470 override public UserAgentData GetAgentByUUID(UUID uuid)
471 { 471 {
472 try 472 try
473 { 473 {
@@ -493,7 +493,7 @@ namespace OpenSim.Data.MSSQL
493 /// <param name="AgentID">The agent UUID</param> 493 /// <param name="AgentID">The agent UUID</param>
494 /// <param name="WebLoginKey">the WebLogin Key</param> 494 /// <param name="WebLoginKey">the WebLogin Key</param>
495 /// <remarks>unused ?</remarks> 495 /// <remarks>unused ?</remarks>
496 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 496 override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
497 { 497 {
498 UserProfileData user = GetUserByUUID(AgentID); 498 UserProfileData user = GetUserByUUID(AgentID);
499 user.WebLoginKey = WebLoginKey; 499 user.WebLoginKey = WebLoginKey;
@@ -549,12 +549,12 @@ namespace OpenSim.Data.MSSQL
549 /// <param name="profileImage">UUID for profile image</param> 549 /// <param name="profileImage">UUID for profile image</param>
550 /// <param name="firstImage">UUID for firstlife image</param> 550 /// <param name="firstImage">UUID for firstlife image</param>
551 /// <returns>Success?</returns> 551 /// <returns>Success?</returns>
552 private bool InsertUserRow(LLUUID uuid, string username, string lastname, string passwordHash, 552 private bool InsertUserRow(UUID uuid, string username, string lastname, string passwordHash,
553 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ, 553 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
554 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 554 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
555 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 555 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
556 string aboutText, string firstText, 556 string aboutText, string firstText,
557 LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey) 557 UUID profileImage, UUID firstImage, UUID webLoginKey)
558 { 558 {
559 string sql = "INSERT INTO "+m_usersTableName; 559 string sql = "INSERT INTO "+m_usersTableName;
560 sql += " ([UUID], [username], [lastname], [passwordHash], [passwordSalt], [homeRegion], "; 560 sql += " ([UUID], [username], [lastname], [passwordHash], [passwordSalt], [homeRegion], ";
@@ -594,7 +594,7 @@ namespace OpenSim.Data.MSSQL
594 parameters["profileFirstText"] = firstText; 594 parameters["profileFirstText"] = firstText;
595 parameters["profileImage"] = profileImage.ToString(); 595 parameters["profileImage"] = profileImage.ToString();
596 parameters["profileFirstImage"] = firstImage.ToString(); 596 parameters["profileFirstImage"] = firstImage.ToString();
597 parameters["webLoginKey"] = LLUUID.Random().ToString(); 597 parameters["webLoginKey"] = UUID.Random().ToString();
598 598
599 599
600 try 600 try
@@ -683,7 +683,7 @@ namespace OpenSim.Data.MSSQL
683 SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString()); 683 SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
684 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString()); 684 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
685 SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString()); 685 SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
686 SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString()); 686 SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.ToString());
687 command.Parameters.Add(param1); 687 command.Parameters.Add(param1);
688 command.Parameters.Add(param2); 688 command.Parameters.Add(param2);
689 command.Parameters.Add(param3); 689 command.Parameters.Add(param3);
@@ -728,7 +728,7 @@ namespace OpenSim.Data.MSSQL
728 /// <param name="to">The receivers account ID</param> 728 /// <param name="to">The receivers account ID</param>
729 /// <param name="amount">The amount to transfer</param> 729 /// <param name="amount">The amount to transfer</param>
730 /// <returns>false</returns> 730 /// <returns>false</returns>
731 override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 731 override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
732 { 732 {
733 return false; 733 return false;
734 } 734 }
@@ -741,14 +741,14 @@ namespace OpenSim.Data.MSSQL
741 /// <param name="to">The receivers account ID</param> 741 /// <param name="to">The receivers account ID</param>
742 /// <param name="item">The item to transfer</param> 742 /// <param name="item">The item to transfer</param>
743 /// <returns>false</returns> 743 /// <returns>false</returns>
744 override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 744 override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
745 { 745 {
746 return false; 746 return false;
747 } 747 }
748 748
749 /// Appearance 749 /// Appearance
750 /// TODO: stubs for now to get us to a compiling state gently 750 /// TODO: stubs for now to get us to a compiling state gently
751 override public AvatarAppearance GetUserAppearance(LLUUID user) 751 override public AvatarAppearance GetUserAppearance(UUID user)
752 { 752 {
753// return new AvatarAppearance(); 753// return new AvatarAppearance();
754 try 754 try
@@ -784,37 +784,37 @@ namespace OpenSim.Data.MSSQL
784 { 784 {
785 AvatarAppearance appearance = new AvatarAppearance(); 785 AvatarAppearance appearance = new AvatarAppearance();
786 786
787 appearance.Owner = new LLUUID((string)reader["owner"]); 787 appearance.Owner = new UUID((string)reader["owner"]);
788 appearance.Serial = Convert.ToInt32(reader["serial"]); 788 appearance.Serial = Convert.ToInt32(reader["serial"]);
789 appearance.VisualParams = (byte[])reader["visual_params"]; 789 appearance.VisualParams = (byte[])reader["visual_params"];
790 appearance.Texture = new LLObject.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length); 790 appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
791 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]); 791 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
792 appearance.BodyItem = new LLUUID((string)reader["body_item"]); 792 appearance.BodyItem = new UUID((string)reader["body_item"]);
793 appearance.BodyAsset = new LLUUID((string)reader["body_asset"]); 793 appearance.BodyAsset = new UUID((string)reader["body_asset"]);
794 appearance.SkinItem = new LLUUID((string)reader["skin_item"]); 794 appearance.SkinItem = new UUID((string)reader["skin_item"]);
795 appearance.SkinAsset = new LLUUID((string)reader["skin_asset"]); 795 appearance.SkinAsset = new UUID((string)reader["skin_asset"]);
796 appearance.HairItem = new LLUUID((string)reader["hair_item"]); 796 appearance.HairItem = new UUID((string)reader["hair_item"]);
797 appearance.HairAsset = new LLUUID((string)reader["hair_asset"]); 797 appearance.HairAsset = new UUID((string)reader["hair_asset"]);
798 appearance.EyesItem = new LLUUID((string)reader["eyes_item"]); 798 appearance.EyesItem = new UUID((string)reader["eyes_item"]);
799 appearance.EyesAsset = new LLUUID((string)reader["eyes_asset"]); 799 appearance.EyesAsset = new UUID((string)reader["eyes_asset"]);
800 appearance.ShirtItem = new LLUUID((string)reader["shirt_item"]); 800 appearance.ShirtItem = new UUID((string)reader["shirt_item"]);
801 appearance.ShirtAsset = new LLUUID((string)reader["shirt_asset"]); 801 appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]);
802 appearance.PantsItem = new LLUUID((string)reader["pants_item"]); 802 appearance.PantsItem = new UUID((string)reader["pants_item"]);
803 appearance.PantsAsset = new LLUUID((string)reader["pants_asset"]); 803 appearance.PantsAsset = new UUID((string)reader["pants_asset"]);
804 appearance.ShoesItem = new LLUUID((string)reader["shoes_item"]); 804 appearance.ShoesItem = new UUID((string)reader["shoes_item"]);
805 appearance.ShoesAsset = new LLUUID((string)reader["shoes_asset"]); 805 appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]);
806 appearance.SocksItem = new LLUUID((string)reader["socks_item"]); 806 appearance.SocksItem = new UUID((string)reader["socks_item"]);
807 appearance.SocksAsset = new LLUUID((string)reader["socks_asset"]); 807 appearance.SocksAsset = new UUID((string)reader["socks_asset"]);
808 appearance.JacketItem = new LLUUID((string)reader["jacket_item"]); 808 appearance.JacketItem = new UUID((string)reader["jacket_item"]);
809 appearance.JacketAsset = new LLUUID((string)reader["jacket_asset"]); 809 appearance.JacketAsset = new UUID((string)reader["jacket_asset"]);
810 appearance.GlovesItem = new LLUUID((string)reader["gloves_item"]); 810 appearance.GlovesItem = new UUID((string)reader["gloves_item"]);
811 appearance.GlovesAsset = new LLUUID((string)reader["gloves_asset"]); 811 appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]);
812 appearance.UnderShirtItem = new LLUUID((string)reader["undershirt_item"]); 812 appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]);
813 appearance.UnderShirtAsset = new LLUUID((string)reader["undershirt_asset"]); 813 appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]);
814 appearance.UnderPantsItem = new LLUUID((string)reader["underpants_item"]); 814 appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]);
815 appearance.UnderPantsAsset = new LLUUID((string)reader["underpants_asset"]); 815 appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]);
816 appearance.SkirtItem = new LLUUID((string)reader["skirt_item"]); 816 appearance.SkirtItem = new UUID((string)reader["skirt_item"]);
817 appearance.SkirtAsset = new LLUUID((string)reader["skirt_asset"]); 817 appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]);
818 818
819 return appearance; 819 return appearance;
820 } 820 }
@@ -831,7 +831,7 @@ namespace OpenSim.Data.MSSQL
831 /// </summary> 831 /// </summary>
832 /// <param name="user">the used UUID</param> 832 /// <param name="user">the used UUID</param>
833 /// <param name="appearance">the appearence</param> 833 /// <param name="appearance">the appearence</param>
834 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 834 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
835 { 835 {
836 string sql = String.Empty; 836 string sql = String.Empty;
837 sql += "DELETE FROM avatarappearance WHERE owner=@owner "; 837 sql += "DELETE FROM avatarappearance WHERE owner=@owner ";
@@ -918,7 +918,7 @@ namespace OpenSim.Data.MSSQL
918 { 918 {
919 } 919 }
920 920
921 override public void ResetAttachments(LLUUID userID) 921 override public void ResetAttachments(UUID userID)
922 { 922 {
923 } 923 }
924 } 924 }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 08a8c6e..5c58a4b 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using MySql.Data.MySqlClient; 34using MySql.Data.MySqlClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -116,7 +116,7 @@ namespace OpenSim.Data.MySQL
116 /// <param name="assetID">Asset UUID to fetch</param> 116 /// <param name="assetID">Asset UUID to fetch</param>
117 /// <returns>Return the asset</returns> 117 /// <returns>Return the asset</returns>
118 /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> 118 /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
119 override public AssetBase FetchAsset(LLUUID assetID) 119 override public AssetBase FetchAsset(UUID assetID)
120 { 120 {
121 AssetBase asset = null; 121 AssetBase asset = null;
122 lock (_dbConnection) 122 lock (_dbConnection)
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MySQL
223 /// </summary> 223 /// </summary>
224 /// <param name="uuid">The asset UUID</param> 224 /// <param name="uuid">The asset UUID</param>
225 /// <returns>true if exist.</returns> 225 /// <returns>true if exist.</returns>
226 override public bool ExistsAsset(LLUUID uuid) 226 override public bool ExistsAsset(UUID uuid)
227 { 227 {
228 bool assetExists = false; 228 bool assetExists = false;
229 229
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 2ab7d40..8eddec6 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MySQL
157 m_lastConnectionUse = timeNow; 157 m_lastConnectionUse = timeNow;
158 } 158 }
159 159
160 public EstateSettings LoadEstateSettings(LLUUID regionID) 160 public EstateSettings LoadEstateSettings(UUID regionID)
161 { 161 {
162 EstateSettings es = new EstateSettings(); 162 EstateSettings es = new EstateSettings();
163 es.OnSave += StoreEstateSettings; 163 es.OnSave += StoreEstateSettings;
@@ -185,11 +185,11 @@ namespace OpenSim.Data.MySQL
185 else 185 else
186 m_FieldMap[name].SetValue(es, false); 186 m_FieldMap[name].SetValue(es, false);
187 } 187 }
188 else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) 188 else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
189 { 189 {
190 LLUUID uuid = LLUUID.Zero; 190 UUID uuid = UUID.Zero;
191 191
192 LLUUID.TryParse(r[name].ToString(), out uuid); 192 UUID.TryParse(r[name].ToString(), out uuid);
193 m_FieldMap[name].SetValue(es, uuid); 193 m_FieldMap[name].SetValue(es, uuid);
194 } 194 }
195 else 195 else
@@ -330,8 +330,8 @@ namespace OpenSim.Data.MySQL
330 { 330 {
331 EstateBan eb = new EstateBan(); 331 EstateBan eb = new EstateBan();
332 332
333 LLUUID uuid = new LLUUID(); 333 UUID uuid = new UUID();
334 LLUUID.TryParse(r["bannedUUID"].ToString(), out uuid); 334 UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
335 335
336 eb.bannedUUID = uuid; 336 eb.bannedUUID = uuid;
337 eb.bannedIP = "0.0.0.0"; 337 eb.bannedIP = "0.0.0.0";
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
366 } 366 }
367 } 367 }
368 368
369 void SaveUUIDList(uint EstateID, string table, LLUUID[] data) 369 void SaveUUIDList(uint EstateID, string table, UUID[] data)
370 { 370 {
371 CheckConnection(); 371 CheckConnection();
372 372
@@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL
381 381
382 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )"; 382 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )";
383 383
384 foreach (LLUUID uuid in data) 384 foreach (UUID uuid in data)
385 { 385 {
386 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString()); 386 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
387 cmd.Parameters.AddWithValue("?uuid", uuid.ToString()); 387 cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
@@ -391,9 +391,9 @@ namespace OpenSim.Data.MySQL
391 } 391 }
392 } 392 }
393 393
394 LLUUID[] LoadUUIDList(uint EstateID, string table) 394 UUID[] LoadUUIDList(uint EstateID, string table)
395 { 395 {
396 List<LLUUID> uuids = new List<LLUUID>(); 396 List<UUID> uuids = new List<UUID>();
397 397
398 CheckConnection(); 398 CheckConnection();
399 399
@@ -408,8 +408,8 @@ namespace OpenSim.Data.MySQL
408 { 408 {
409 // EstateBan eb = new EstateBan(); 409 // EstateBan eb = new EstateBan();
410 410
411 LLUUID uuid = new LLUUID(); 411 UUID uuid = new UUID();
412 LLUUID.TryParse(r["uuid"].ToString(), out uuid); 412 UUID.TryParse(r["uuid"].ToString(), out uuid);
413 413
414 uuids.Add(uuid); 414 uuids.Add(uuid);
415 } 415 }
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 9dc3d18..fa5b33c 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL
121 } 121 }
122 else 122 else
123 { 123 {
124 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); 124 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead");
125 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); 125 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
126 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); 126 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
127 string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); 127 string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
@@ -322,7 +322,7 @@ namespace OpenSim.Data.MySQL
322 /// </summary> 322 /// </summary>
323 /// <param name="uuid">The region UUID</param> 323 /// <param name="uuid">The region UUID</param>
324 /// <returns>The sim profile</returns> 324 /// <returns>The sim profile</returns>
325 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 325 override public RegionProfileData GetProfileByUUID(UUID uuid)
326 { 326 {
327 MySQLSuperManager dbm = GetLockedConnection(); 327 MySQLSuperManager dbm = GetLockedConnection();
328 328
@@ -458,14 +458,14 @@ namespace OpenSim.Data.MySQL
458 /// <param name="handle">The attempted regionHandle of the challenger</param> 458 /// <param name="handle">The attempted regionHandle of the challenger</param>
459 /// <param name="authkey">The secret</param> 459 /// <param name="authkey">The secret</param>
460 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 460 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
461 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 461 override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
462 { 462 {
463 bool throwHissyFit = false; // Should be true by 1.0 463 bool throwHissyFit = false; // Should be true by 1.0
464 464
465 if (throwHissyFit) 465 if (throwHissyFit)
466 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 466 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
467 467
468 RegionProfileData data = GetProfileByLLUUID(uuid); 468 RegionProfileData data = GetProfileByUUID(uuid);
469 469
470 return (handle == data.regionHandle && authkey == data.regionSecret); 470 return (handle == data.regionHandle && authkey == data.regionSecret);
471 } 471 }
@@ -479,7 +479,7 @@ namespace OpenSim.Data.MySQL
479 /// <param name="authhash"></param> 479 /// <param name="authhash"></param>
480 /// <param name="challenge"></param> 480 /// <param name="challenge"></param>
481 /// <returns></returns> 481 /// <returns></returns>
482 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 482 public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
483 { 483 {
484 // SHA512Managed HashProvider = new SHA512Managed(); 484 // SHA512Managed HashProvider = new SHA512Managed();
485 // Encoding TextProvider = new UTF8Encoding(); 485 // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index fe2d393..50d3cc7 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
34using OpenSim.Framework; 34using OpenSim.Framework;
@@ -125,7 +125,7 @@ namespace OpenSim.Data.MySQL
125 /// </summary> 125 /// </summary>
126 /// <param name="folderID">The folder to search</param> 126 /// <param name="folderID">The folder to search</param>
127 /// <returns>A list containing inventory items</returns> 127 /// <returns>A list containing inventory items</returns>
128 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 128 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
129 { 129 {
130 try 130 try
131 { 131 {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.MySQL
163 /// </summary> 163 /// </summary>
164 /// <param name="user">The user whos inventory is to be searched</param> 164 /// <param name="user">The user whos inventory is to be searched</param>
165 /// <returns>A list of folder objects</returns> 165 /// <returns>A list of folder objects</returns>
166 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 166 public List<InventoryFolderBase> getUserRootFolders(UUID user)
167 { 167 {
168 try 168 try
169 { 169 {
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MySQL
176 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", 176 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
177 database.Connection); 177 database.Connection);
178 result.Parameters.AddWithValue("?uuid", user.ToString()); 178 result.Parameters.AddWithValue("?uuid", user.ToString());
179 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString()); 179 result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
180 MySqlDataReader reader = result.ExecuteReader(); 180 MySqlDataReader reader = result.ExecuteReader();
181 181
182 List<InventoryFolderBase> items = new List<InventoryFolderBase>(); 182 List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL
204 /// </summary> 204 /// </summary>
205 /// <param name="user">The user UUID</param> 205 /// <param name="user">The user UUID</param>
206 /// <returns></returns> 206 /// <returns></returns>
207 public InventoryFolderBase getUserRootFolder(LLUUID user) 207 public InventoryFolderBase getUserRootFolder(UUID user)
208 { 208 {
209 try 209 try
210 { 210 {
@@ -217,7 +217,7 @@ namespace OpenSim.Data.MySQL
217 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", 217 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
218 database.Connection); 218 database.Connection);
219 result.Parameters.AddWithValue("?uuid", user.ToString()); 219 result.Parameters.AddWithValue("?uuid", user.ToString());
220 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString()); 220 result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
221 221
222 MySqlDataReader reader = result.ExecuteReader(); 222 MySqlDataReader reader = result.ExecuteReader();
223 223
@@ -258,7 +258,7 @@ namespace OpenSim.Data.MySQL
258 /// </summary> 258 /// </summary>
259 /// <param name="parentID">The folder to search</param> 259 /// <param name="parentID">The folder to search</param>
260 /// <returns>A list of inventory folders</returns> 260 /// <returns>A list of inventory folders</returns>
261 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 261 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
262 { 262 {
263 try 263 try
264 { 264 {
@@ -302,23 +302,23 @@ namespace OpenSim.Data.MySQL
302 { 302 {
303 InventoryItemBase item = new InventoryItemBase(); 303 InventoryItemBase item = new InventoryItemBase();
304 304
305 item.ID = new LLUUID((string) reader["inventoryID"]); 305 item.ID = new UUID((string) reader["inventoryID"]);
306 item.AssetID = new LLUUID((string) reader["assetID"]); 306 item.AssetID = new UUID((string) reader["assetID"]);
307 item.AssetType = (int) reader["assetType"]; 307 item.AssetType = (int) reader["assetType"];
308 item.Folder = new LLUUID((string) reader["parentFolderID"]); 308 item.Folder = new UUID((string) reader["parentFolderID"]);
309 item.Owner = new LLUUID((string) reader["avatarID"]); 309 item.Owner = new UUID((string) reader["avatarID"]);
310 item.Name = (string) reader["inventoryName"]; 310 item.Name = (string) reader["inventoryName"];
311 item.Description = (string) reader["inventoryDescription"]; 311 item.Description = (string) reader["inventoryDescription"];
312 item.NextPermissions = (uint) reader["inventoryNextPermissions"]; 312 item.NextPermissions = (uint) reader["inventoryNextPermissions"];
313 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"]; 313 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"];
314 item.InvType = (int) reader["invType"]; 314 item.InvType = (int) reader["invType"];
315 item.Creator = new LLUUID((string) reader["creatorID"]); 315 item.Creator = new UUID((string) reader["creatorID"]);
316 item.BasePermissions = (uint) reader["inventoryBasePermissions"]; 316 item.BasePermissions = (uint) reader["inventoryBasePermissions"];
317 item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"]; 317 item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"];
318 item.SalePrice = (int) reader["salePrice"]; 318 item.SalePrice = (int) reader["salePrice"];
319 item.SaleType = Convert.ToByte(reader["saleType"]); 319 item.SaleType = Convert.ToByte(reader["saleType"]);
320 item.CreationDate = (int) reader["creationDate"]; 320 item.CreationDate = (int) reader["creationDate"];
321 item.GroupID = new LLUUID(reader["groupID"].ToString()); 321 item.GroupID = new UUID(reader["groupID"].ToString());
322 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); 322 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
323 item.Flags = (uint) reader["flags"]; 323 item.Flags = (uint) reader["flags"];
324 324
@@ -337,7 +337,7 @@ namespace OpenSim.Data.MySQL
337 /// </summary> 337 /// </summary>
338 /// <param name="item">The item to return</param> 338 /// <param name="item">The item to return</param>
339 /// <returns>An inventory item</returns> 339 /// <returns>An inventory item</returns>
340 public InventoryItemBase getInventoryItem(LLUUID itemID) 340 public InventoryItemBase getInventoryItem(UUID itemID)
341 { 341 {
342 try 342 try
343 { 343 {
@@ -378,9 +378,9 @@ namespace OpenSim.Data.MySQL
378 try 378 try
379 { 379 {
380 InventoryFolderBase folder = new InventoryFolderBase(); 380 InventoryFolderBase folder = new InventoryFolderBase();
381 folder.Owner = new LLUUID((string) reader["agentID"]); 381 folder.Owner = new UUID((string) reader["agentID"]);
382 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 382 folder.ParentID = new UUID((string) reader["parentFolderID"]);
383 folder.ID = new LLUUID((string) reader["folderID"]); 383 folder.ID = new UUID((string) reader["folderID"]);
384 folder.Name = (string) reader["folderName"]; 384 folder.Name = (string) reader["folderName"];
385 folder.Type = (short) reader["type"]; 385 folder.Type = (short) reader["type"];
386 folder.Version = (ushort) ((int) reader["version"]); 386 folder.Version = (ushort) ((int) reader["version"]);
@@ -400,7 +400,7 @@ namespace OpenSim.Data.MySQL
400 /// </summary> 400 /// </summary>
401 /// <param name="folder">The folder to return</param> 401 /// <param name="folder">The folder to return</param>
402 /// <returns>A folder class</returns> 402 /// <returns>A folder class</returns>
403 public InventoryFolderBase getInventoryFolder(LLUUID folderID) 403 public InventoryFolderBase getInventoryFolder(UUID folderID)
404 { 404 {
405 try 405 try
406 { 406 {
@@ -498,7 +498,7 @@ namespace OpenSim.Data.MySQL
498 /// Detele the specified inventory item 498 /// Detele the specified inventory item
499 /// </summary> 499 /// </summary>
500 /// <param name="item">The inventory item UUID to delete</param> 500 /// <param name="item">The inventory item UUID to delete</param>
501 public void deleteInventoryItem(LLUUID itemID) 501 public void deleteInventoryItem(UUID itemID)
502 { 502 {
503 try 503 try
504 { 504 {
@@ -596,7 +596,7 @@ namespace OpenSim.Data.MySQL
596 /// </summary> 596 /// </summary>
597 /// <param name="folders">list where folders will be appended</param> 597 /// <param name="folders">list where folders will be appended</param>
598 /// <param name="parentID">ID of parent</param> 598 /// <param name="parentID">ID of parent</param>
599 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 599 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
600 { 600 {
601 List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID); 601 List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID);
602 602
@@ -610,7 +610,7 @@ namespace OpenSim.Data.MySQL
610 /// </summary> 610 /// </summary>
611 /// <param name="parentID"></param> 611 /// <param name="parentID"></param>
612 /// <returns></returns> 612 /// <returns></returns>
613 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 613 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
614 { 614 {
615 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one 615 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
616 * - We will only need to hit the database twice instead of n times. 616 * - We will only need to hit the database twice instead of n times.
@@ -631,8 +631,8 @@ namespace OpenSim.Data.MySQL
631 try 631 try
632 { 632 {
633 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 633 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
634 Dictionary<LLUUID, List<InventoryFolderBase>> hashtable 634 Dictionary<UUID, List<InventoryFolderBase>> hashtable
635 = new Dictionary<LLUUID, List<InventoryFolderBase>>(); ; 635 = new Dictionary<UUID, List<InventoryFolderBase>>(); ;
636 List<InventoryFolderBase> parentFolder = new List<InventoryFolderBase>(); 636 List<InventoryFolderBase> parentFolder = new List<InventoryFolderBase>();
637 lock (database) 637 lock (database)
638 { 638 {
@@ -655,7 +655,7 @@ namespace OpenSim.Data.MySQL
655 655
656 if (parentFolder.Count >= 1) // No result means parent folder does not exist 656 if (parentFolder.Count >= 1) // No result means parent folder does not exist
657 { 657 {
658 if (parentFolder[0].ParentID == LLUUID.Zero) // We are querying the root folder 658 if (parentFolder[0].ParentID == UUID.Zero) // We are querying the root folder
659 { 659 {
660 /* Get all of the agent's folders from the database, put them in a list and return it */ 660 /* Get all of the agent's folders from the database, put them in a list and return it */
661 result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid", 661 result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid",
@@ -728,7 +728,7 @@ namespace OpenSim.Data.MySQL
728 /// Delete a folder from database 728 /// Delete a folder from database
729 /// </summary> 729 /// </summary>
730 /// <param name="folderID">the folder UUID</param> 730 /// <param name="folderID">the folder UUID</param>
731 protected void deleteOneFolder(LLUUID folderID) 731 protected void deleteOneFolder(UUID folderID)
732 { 732 {
733 try 733 try
734 { 734 {
@@ -754,7 +754,7 @@ namespace OpenSim.Data.MySQL
754 /// Delete all item in a folder 754 /// Delete all item in a folder
755 /// </summary> 755 /// </summary>
756 /// <param name="folderID">the folder UUID</param> 756 /// <param name="folderID">the folder UUID</param>
757 protected void deleteItemsInFolder(LLUUID folderID) 757 protected void deleteItemsInFolder(UUID folderID)
758 { 758 {
759 try 759 try
760 { 760 {
@@ -780,7 +780,7 @@ namespace OpenSim.Data.MySQL
780 /// Deletes an inventory folder 780 /// Deletes an inventory folder
781 /// </summary> 781 /// </summary>
782 /// <param name="folderId">Id of folder to delete</param> 782 /// <param name="folderId">Id of folder to delete</param>
783 public void deleteInventoryFolder(LLUUID folderID) 783 public void deleteInventoryFolder(UUID folderID)
784 { 784 {
785 List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID); 785 List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
786 786
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index c02016c..07ef916 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL
63 } 63 }
64 else 64 else
65 { 65 {
66 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); 66 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead");
67 67
68 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); 68 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
69 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); 69 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index e863216..6048f93 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -31,7 +31,7 @@ using System.Collections;
31using System.Data; 31using System.Data;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -384,8 +384,8 @@ namespace OpenSim.Data.MySQL
384 { 384 {
385 retval.regionHandle = tmp64; 385 retval.regionHandle = tmp64;
386 } 386 }
387 LLUUID tmp_uuid; 387 UUID tmp_uuid;
388 if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid)) 388 if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
389 { 389 {
390 return null; 390 return null;
391 } 391 }
@@ -396,7 +396,7 @@ namespace OpenSim.Data.MySQL
396 396
397 // non-critical parts 397 // non-critical parts
398 retval.regionName = (string)reader["regionName"]; 398 retval.regionName = (string)reader["regionName"];
399 retval.originUUID = new LLUUID((string) reader["originUUID"]); 399 retval.originUUID = new UUID((string) reader["originUUID"]);
400 400
401 // Secrets 401 // Secrets
402 retval.regionRecvKey = (string) reader["regionRecvKey"]; 402 retval.regionRecvKey = (string) reader["regionRecvKey"];
@@ -434,8 +434,8 @@ namespace OpenSim.Data.MySQL
434 retval.regionUserSendKey = (string) reader["regionUserSendKey"]; 434 retval.regionUserSendKey = (string) reader["regionUserSendKey"];
435 435
436 // World Map Addition 436 // World Map Addition
437 LLUUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); 437 UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
438 LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); 438 UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
439 } 439 }
440 else 440 else
441 { 441 {
@@ -463,8 +463,8 @@ namespace OpenSim.Data.MySQL
463 retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString()); 463 retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
464 retval.reservationName = (string) reader["resName"]; 464 retval.reservationName = (string) reader["resName"];
465 retval.status = Convert.ToInt32(reader["status"].ToString()) == 1; 465 retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
466 LLUUID tmp; 466 UUID tmp;
467 LLUUID.TryParse((string) reader["userUUID"], out tmp); 467 UUID.TryParse((string) reader["userUUID"], out tmp);
468 retval.userUUID = tmp; 468 retval.userUUID = tmp;
469 } 469 }
470 else 470 else
@@ -486,15 +486,15 @@ namespace OpenSim.Data.MySQL
486 if (reader.Read()) 486 if (reader.Read())
487 { 487 {
488 // Agent IDs 488 // Agent IDs
489 LLUUID tmp; 489 UUID tmp;
490 if (!LLUUID.TryParse((string)reader["UUID"], out tmp)) 490 if (!UUID.TryParse((string)reader["UUID"], out tmp))
491 return null; 491 return null;
492 retval.ProfileID = tmp; 492 retval.ProfileID = tmp;
493 493
494 LLUUID.TryParse((string) reader["sessionID"], out tmp); 494 UUID.TryParse((string) reader["sessionID"], out tmp);
495 retval.SessionID = tmp; 495 retval.SessionID = tmp;
496 496
497 LLUUID.TryParse((string)reader["secureSessionID"], out tmp); 497 UUID.TryParse((string)reader["secureSessionID"], out tmp);
498 retval.SecureSessionID = tmp; 498 retval.SecureSessionID = tmp;
499 499
500 // Agent Who? 500 // Agent Who?
@@ -507,10 +507,10 @@ namespace OpenSim.Data.MySQL
507 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString()); 507 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
508 508
509 // Current position 509 // Current position
510 retval.Region = new LLUUID((string)reader["currentRegion"]); 510 retval.Region = new UUID((string)reader["currentRegion"]);
511 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); 511 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
512 LLVector3 tmp_v; 512 Vector3 tmp_v;
513 LLVector3.TryParse((string) reader["currentPos"], out tmp_v); 513 Vector3.TryParse((string) reader["currentPos"], out tmp_v);
514 retval.Position = tmp_v; 514 retval.Position = tmp_v;
515 } 515 }
516 else 516 else
@@ -531,8 +531,8 @@ namespace OpenSim.Data.MySQL
531 531
532 if (reader.Read()) 532 if (reader.Read())
533 { 533 {
534 LLUUID id; 534 UUID id;
535 if (!LLUUID.TryParse((string)reader["UUID"], out id)) 535 if (!UUID.TryParse((string)reader["UUID"], out id))
536 return null; 536 return null;
537 537
538 retval.ID = id; 538 retval.ID = id;
@@ -543,17 +543,17 @@ namespace OpenSim.Data.MySQL
543 retval.PasswordSalt = (string) reader["passwordSalt"]; 543 retval.PasswordSalt = (string) reader["passwordSalt"];
544 544
545 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 545 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
546 retval.HomeLocation = new LLVector3( 546 retval.HomeLocation = new Vector3(
547 Convert.ToSingle(reader["homeLocationX"].ToString()), 547 Convert.ToSingle(reader["homeLocationX"].ToString()),
548 Convert.ToSingle(reader["homeLocationY"].ToString()), 548 Convert.ToSingle(reader["homeLocationY"].ToString()),
549 Convert.ToSingle(reader["homeLocationZ"].ToString())); 549 Convert.ToSingle(reader["homeLocationZ"].ToString()));
550 retval.HomeLookAt = new LLVector3( 550 retval.HomeLookAt = new Vector3(
551 Convert.ToSingle(reader["homeLookAtX"].ToString()), 551 Convert.ToSingle(reader["homeLookAtX"].ToString()),
552 Convert.ToSingle(reader["homeLookAtY"].ToString()), 552 Convert.ToSingle(reader["homeLookAtY"].ToString()),
553 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 553 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
554 554
555 LLUUID regionID = LLUUID.Zero; 555 UUID regionID = UUID.Zero;
556 LLUUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero 556 UUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
557 retval.HomeRegionID = regionID; 557 retval.HomeRegionID = regionID;
558 558
559 retval.Created = Convert.ToInt32(reader["created"].ToString()); 559 retval.Created = Convert.ToInt32(reader["created"].ToString());
@@ -576,29 +576,29 @@ namespace OpenSim.Data.MySQL
576 retval.FirstLifeAboutText = (string)reader["profileFirstText"]; 576 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
577 577
578 if (reader.IsDBNull(reader.GetOrdinal("profileImage"))) 578 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
579 retval.Image = LLUUID.Zero; 579 retval.Image = UUID.Zero;
580 else { 580 else {
581 LLUUID tmp; 581 UUID tmp;
582 LLUUID.TryParse((string)reader["profileImage"], out tmp); 582 UUID.TryParse((string)reader["profileImage"], out tmp);
583 retval.Image = tmp; 583 retval.Image = tmp;
584 } 584 }
585 585
586 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage"))) 586 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
587 retval.FirstLifeImage = LLUUID.Zero; 587 retval.FirstLifeImage = UUID.Zero;
588 else { 588 else {
589 LLUUID tmp; 589 UUID tmp;
590 LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); 590 UUID.TryParse((string)reader["profileFirstImage"], out tmp);
591 retval.FirstLifeImage = tmp; 591 retval.FirstLifeImage = tmp;
592 } 592 }
593 593
594 if (reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) 594 if (reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
595 { 595 {
596 retval.WebLoginKey = LLUUID.Zero; 596 retval.WebLoginKey = UUID.Zero;
597 } 597 }
598 else 598 else
599 { 599 {
600 LLUUID tmp; 600 UUID tmp;
601 LLUUID.TryParse((string)reader["webLoginKey"], out tmp); 601 UUID.TryParse((string)reader["webLoginKey"], out tmp);
602 retval.WebLoginKey = tmp; 602 retval.WebLoginKey = tmp;
603 } 603 }
604 604
@@ -611,12 +611,12 @@ namespace OpenSim.Data.MySQL
611 611
612 if (reader.IsDBNull(reader.GetOrdinal("partner"))) 612 if (reader.IsDBNull(reader.GetOrdinal("partner")))
613 { 613 {
614 retval.Partner = LLUUID.Zero; 614 retval.Partner = UUID.Zero;
615 } 615 }
616 else 616 else
617 { 617 {
618 LLUUID tmp; 618 UUID tmp;
619 LLUUID.TryParse((string)reader["partner"], out tmp); 619 UUID.TryParse((string)reader["partner"], out tmp);
620 retval.Partner = tmp; 620 retval.Partner = tmp;
621 } 621 }
622 } 622 }
@@ -638,37 +638,37 @@ namespace OpenSim.Data.MySQL
638 if (reader.Read()) 638 if (reader.Read())
639 { 639 {
640 appearance = new AvatarAppearance(); 640 appearance = new AvatarAppearance();
641 appearance.Owner = new LLUUID((string)reader["owner"]); 641 appearance.Owner = new UUID((string)reader["owner"]);
642 appearance.Serial = Convert.ToInt32(reader["serial"]); 642 appearance.Serial = Convert.ToInt32(reader["serial"]);
643 appearance.VisualParams = (byte[])reader["visual_params"]; 643 appearance.VisualParams = (byte[])reader["visual_params"];
644 appearance.Texture = new LLObject.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length); 644 appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
645 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]); 645 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
646 appearance.BodyItem = new LLUUID((string)reader["body_item"]); 646 appearance.BodyItem = new UUID((string)reader["body_item"]);
647 appearance.BodyAsset = new LLUUID((string)reader["body_asset"]); 647 appearance.BodyAsset = new UUID((string)reader["body_asset"]);
648 appearance.SkinItem = new LLUUID((string)reader["skin_item"]); 648 appearance.SkinItem = new UUID((string)reader["skin_item"]);
649 appearance.SkinAsset = new LLUUID((string)reader["skin_asset"]); 649 appearance.SkinAsset = new UUID((string)reader["skin_asset"]);
650 appearance.HairItem = new LLUUID((string)reader["hair_item"]); 650 appearance.HairItem = new UUID((string)reader["hair_item"]);
651 appearance.HairAsset = new LLUUID((string)reader["hair_asset"]); 651 appearance.HairAsset = new UUID((string)reader["hair_asset"]);
652 appearance.EyesItem = new LLUUID((string)reader["eyes_item"]); 652 appearance.EyesItem = new UUID((string)reader["eyes_item"]);
653 appearance.EyesAsset = new LLUUID((string)reader["eyes_asset"]); 653 appearance.EyesAsset = new UUID((string)reader["eyes_asset"]);
654 appearance.ShirtItem = new LLUUID((string)reader["shirt_item"]); 654 appearance.ShirtItem = new UUID((string)reader["shirt_item"]);
655 appearance.ShirtAsset = new LLUUID((string)reader["shirt_asset"]); 655 appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]);
656 appearance.PantsItem = new LLUUID((string)reader["pants_item"]); 656 appearance.PantsItem = new UUID((string)reader["pants_item"]);
657 appearance.PantsAsset = new LLUUID((string)reader["pants_asset"]); 657 appearance.PantsAsset = new UUID((string)reader["pants_asset"]);
658 appearance.ShoesItem = new LLUUID((string)reader["shoes_item"]); 658 appearance.ShoesItem = new UUID((string)reader["shoes_item"]);
659 appearance.ShoesAsset = new LLUUID((string)reader["shoes_asset"]); 659 appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]);
660 appearance.SocksItem = new LLUUID((string)reader["socks_item"]); 660 appearance.SocksItem = new UUID((string)reader["socks_item"]);
661 appearance.SocksAsset = new LLUUID((string)reader["socks_asset"]); 661 appearance.SocksAsset = new UUID((string)reader["socks_asset"]);
662 appearance.JacketItem = new LLUUID((string)reader["jacket_item"]); 662 appearance.JacketItem = new UUID((string)reader["jacket_item"]);
663 appearance.JacketAsset = new LLUUID((string)reader["jacket_asset"]); 663 appearance.JacketAsset = new UUID((string)reader["jacket_asset"]);
664 appearance.GlovesItem = new LLUUID((string)reader["gloves_item"]); 664 appearance.GlovesItem = new UUID((string)reader["gloves_item"]);
665 appearance.GlovesAsset = new LLUUID((string)reader["gloves_asset"]); 665 appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]);
666 appearance.UnderShirtItem = new LLUUID((string)reader["undershirt_item"]); 666 appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]);
667 appearance.UnderShirtAsset = new LLUUID((string)reader["undershirt_asset"]); 667 appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]);
668 appearance.UnderPantsItem = new LLUUID((string)reader["underpants_item"]); 668 appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]);
669 appearance.UnderPantsAsset = new LLUUID((string)reader["underpants_asset"]); 669 appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]);
670 appearance.SkirtItem = new LLUUID((string)reader["skirt_item"]); 670 appearance.SkirtItem = new UUID((string)reader["skirt_item"]);
671 appearance.SkirtAsset = new LLUUID((string)reader["skirt_asset"]); 671 appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]);
672 } 672 }
673 return appearance; 673 return appearance;
674 } 674 }
@@ -766,12 +766,12 @@ namespace OpenSim.Data.MySQL
766 /// <param name="firstImage">UUID for firstlife image</param> 766 /// <param name="firstImage">UUID for firstlife image</param>
767 /// <param name="webLoginKey">Ignored</param> 767 /// <param name="webLoginKey">Ignored</param>
768 /// <returns>Success?</returns> 768 /// <returns>Success?</returns>
769 public bool insertUserRow(LLUUID uuid, string username, string lastname, string passwordHash, 769 public bool insertUserRow(UUID uuid, string username, string lastname, string passwordHash,
770 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ, 770 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
771 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 771 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
772 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 772 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
773 string aboutText, string firstText, 773 string aboutText, string firstText,
774 LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey) 774 UUID profileImage, UUID firstImage, UUID webLoginKey)
775 { 775 {
776 m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString()); 776 m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString());
777 string sql = 777 string sql =
@@ -867,12 +867,12 @@ namespace OpenSim.Data.MySQL
867 /// <param name="firstImage">UUID for firstlife image</param> 867 /// <param name="firstImage">UUID for firstlife image</param>
868 /// <param name="webLoginKey">UUID for weblogin Key</param> 868 /// <param name="webLoginKey">UUID for weblogin Key</param>
869 /// <returns>Success?</returns> 869 /// <returns>Success?</returns>
870 public bool updateUserRow(LLUUID uuid, string username, string lastname, string passwordHash, 870 public bool updateUserRow(UUID uuid, string username, string lastname, string passwordHash,
871 string passwordSalt, UInt64 homeRegion, LLUUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ, 871 string passwordSalt, UInt64 homeRegion, UUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
872 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 872 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
873 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 873 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
874 string aboutText, string firstText, 874 string aboutText, string firstText,
875 LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey, int userFlags, int godLevel, string customType, LLUUID partner) 875 UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
876 { 876 {
877 string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname "; 877 string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname ";
878 sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , "; 878 sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , ";
@@ -1211,7 +1211,7 @@ namespace OpenSim.Data.MySQL
1211 1211
1212 } 1212 }
1213 1213
1214 public void writeAttachments(LLUUID agentID, Hashtable data) 1214 public void writeAttachments(UUID agentID, Hashtable data)
1215 { 1215 {
1216 string sql = "delete from avatarattachments where UUID = ?uuid"; 1216 string sql = "delete from avatarattachments where UUID = ?uuid";
1217 1217
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 903f022..9552ba1 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -296,15 +296,15 @@ namespace OpenSim.Data.MySQL
296 /// </summary> 296 /// </summary>
297 /// <param name="obj">The object</param> 297 /// <param name="obj">The object</param>
298 /// <param name="regionUUID">The region UUID</param> 298 /// <param name="regionUUID">The region UUID</param>
299 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 299 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
300 { 300 {
301 lock (m_dataSet) 301 lock (m_dataSet)
302 { 302 {
303 foreach (SceneObjectPart prim in obj.Children.Values) 303 foreach (SceneObjectPart prim in obj.Children.Values)
304 { 304 {
305 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0 305 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
306 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 306 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
307 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) 307 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
308 { 308 {
309 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 309 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
310 addPrim(prim, obj.UUID, regionUUID); 310 addPrim(prim, obj.UUID, regionUUID);
@@ -323,9 +323,9 @@ namespace OpenSim.Data.MySQL
323 /// </summary> 323 /// </summary>
324 /// <param name="obj">The object</param> 324 /// <param name="obj">The object</param>
325 /// <param name="regionUUID">The Region UUID</param> 325 /// <param name="regionUUID">The Region UUID</param>
326 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 326 public void RemoveObject(UUID obj, UUID regionUUID)
327 { 327 {
328 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 328 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj, regionUUID);
329 329
330 DataTable prims = m_primTable; 330 DataTable prims = m_primTable;
331 DataTable shapes = m_shapeTable; 331 DataTable shapes = m_shapeTable;
@@ -337,7 +337,7 @@ namespace OpenSim.Data.MySQL
337 foreach (DataRow row in primRows) 337 foreach (DataRow row in primRows)
338 { 338 {
339 // Remove shapes row 339 // Remove shapes row
340 LLUUID uuid = new LLUUID((string) row["UUID"]); 340 UUID uuid = new UUID((string) row["UUID"]);
341 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid)); 341 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
342 if (shapeRow != null) 342 if (shapeRow != null)
343 { 343 {
@@ -358,7 +358,7 @@ namespace OpenSim.Data.MySQL
358 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes. 358 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
359 /// </summary> 359 /// </summary>
360 /// <param name="uuid">the Item UUID</param> 360 /// <param name="uuid">the Item UUID</param>
361 private void RemoveItems(LLUUID uuid) 361 private void RemoveItems(UUID uuid)
362 { 362 {
363 String sql = String.Format("primID = '{0}'", uuid); 363 String sql = String.Format("primID = '{0}'", uuid);
364 DataRow[] itemRows = m_itemsTable.Select(sql); 364 DataRow[] itemRows = m_itemsTable.Select(sql);
@@ -374,9 +374,9 @@ namespace OpenSim.Data.MySQL
374 /// </summary> 374 /// </summary>
375 /// <param name="regionUUID">the Region UUID</param> 375 /// <param name="regionUUID">the Region UUID</param>
376 /// <returns>List of loaded groups</returns> 376 /// <returns>List of loaded groups</returns>
377 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 377 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
378 { 378 {
379 Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); 379 Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
380 380
381 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); 381 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
382 382
@@ -436,7 +436,7 @@ namespace OpenSim.Data.MySQL
436 "No shape found for prim in storage, so setting default box shape"); 436 "No shape found for prim in storage, so setting default box shape");
437 prim.Shape = PrimitiveBaseShape.Default; 437 prim.Shape = PrimitiveBaseShape.Default;
438 } 438 }
439 createdObjects[new LLUUID(objID)].AddPart(prim); 439 createdObjects[new UUID(objID)].AddPart(prim);
440 } 440 }
441 441
442 LoadItems(prim); 442 LoadItems(prim);
@@ -497,7 +497,7 @@ namespace OpenSim.Data.MySQL
497 /// </summary> 497 /// </summary>
498 /// <param name="ter">HeightField data</param> 498 /// <param name="ter">HeightField data</param>
499 /// <param name="regionID">region UUID</param> 499 /// <param name="regionID">region UUID</param>
500 public void StoreTerrain(double[,] ter, LLUUID regionID) 500 public void StoreTerrain(double[,] ter, UUID regionID)
501 { 501 {
502 int revision = 1; 502 int revision = 1;
503 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString()); 503 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
@@ -527,7 +527,7 @@ namespace OpenSim.Data.MySQL
527 /// </summary> 527 /// </summary>
528 /// <param name="regionID">the region UUID</param> 528 /// <param name="regionID">the region UUID</param>
529 /// <returns>Heightfield data</returns> 529 /// <returns>Heightfield data</returns>
530 public double[,] LoadTerrain(LLUUID regionID) 530 public double[,] LoadTerrain(UUID regionID)
531 { 531 {
532 double[,] terret = new double[256,256]; 532 double[,] terret = new double[256,256];
533 terret.Initialize(); 533 terret.Initialize();
@@ -583,7 +583,7 @@ namespace OpenSim.Data.MySQL
583 /// </list> 583 /// </list>
584 /// </summary> 584 /// </summary>
585 /// <param name="globalID"></param> 585 /// <param name="globalID"></param>
586 public void RemoveLandObject(LLUUID globalID) 586 public void RemoveLandObject(UUID globalID)
587 { 587 {
588 lock (m_dataSet) 588 lock (m_dataSet)
589 { 589 {
@@ -646,7 +646,7 @@ namespace OpenSim.Data.MySQL
646 } 646 }
647 } 647 }
648 648
649 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 649 public RegionSettings LoadRegionSettings(UUID regionUUID)
650 { 650 {
651 lock (m_dataSet) 651 lock (m_dataSet)
652 { 652 {
@@ -701,7 +701,7 @@ namespace OpenSim.Data.MySQL
701 /// </summary> 701 /// </summary>
702 /// <param name="regionUUID"></param> 702 /// <param name="regionUUID"></param>
703 /// <returns></returns> 703 /// <returns></returns>
704 public List<LandData> LoadLandObjects(LLUUID regionUUID) 704 public List<LandData> LoadLandObjects(UUID regionUUID)
705 { 705 {
706 List<LandData> landDataForRegion = new List<LandData>(); 706 List<LandData> landDataForRegion = new List<LandData>();
707 lock (m_dataSet) 707 lock (m_dataSet)
@@ -1101,7 +1101,7 @@ namespace OpenSim.Data.MySQL
1101 private SceneObjectPart buildPrim(DataRow row) 1101 private SceneObjectPart buildPrim(DataRow row)
1102 { 1102 {
1103 SceneObjectPart prim = new SceneObjectPart(); 1103 SceneObjectPart prim = new SceneObjectPart();
1104 prim.UUID = new LLUUID((String) row["UUID"]); 1104 prim.UUID = new UUID((String) row["UUID"]);
1105 // explicit conversion of integers is required, which sort 1105 // explicit conversion of integers is required, which sort
1106 // of sucks. No idea if there is a shortcut here or not. 1106 // of sucks. No idea if there is a shortcut here or not.
1107 prim.ParentID = Convert.ToUInt32(row["ParentID"]); 1107 prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -1114,54 +1114,54 @@ namespace OpenSim.Data.MySQL
1114 prim.TouchName = (String) row["TouchName"]; 1114 prim.TouchName = (String) row["TouchName"];
1115 // permissions 1115 // permissions
1116 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 1116 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
1117 prim.CreatorID = new LLUUID((String) row["CreatorID"]); 1117 prim.CreatorID = new UUID((String) row["CreatorID"]);
1118 prim.OwnerID = new LLUUID((String) row["OwnerID"]); 1118 prim.OwnerID = new UUID((String) row["OwnerID"]);
1119 prim.GroupID = new LLUUID((String) row["GroupID"]); 1119 prim.GroupID = new UUID((String) row["GroupID"]);
1120 prim.LastOwnerID = new LLUUID((String) row["LastOwnerID"]); 1120 prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
1121 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); 1121 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
1122 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); 1122 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
1123 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); 1123 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
1124 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]); 1124 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
1125 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); 1125 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
1126 // vectors 1126 // vectors
1127 prim.OffsetPosition = new LLVector3( 1127 prim.OffsetPosition = new Vector3(
1128 Convert.ToSingle(row["PositionX"]), 1128 Convert.ToSingle(row["PositionX"]),
1129 Convert.ToSingle(row["PositionY"]), 1129 Convert.ToSingle(row["PositionY"]),
1130 Convert.ToSingle(row["PositionZ"]) 1130 Convert.ToSingle(row["PositionZ"])
1131 ); 1131 );
1132 prim.GroupPosition = new LLVector3( 1132 prim.GroupPosition = new Vector3(
1133 Convert.ToSingle(row["GroupPositionX"]), 1133 Convert.ToSingle(row["GroupPositionX"]),
1134 Convert.ToSingle(row["GroupPositionY"]), 1134 Convert.ToSingle(row["GroupPositionY"]),
1135 Convert.ToSingle(row["GroupPositionZ"]) 1135 Convert.ToSingle(row["GroupPositionZ"])
1136 ); 1136 );
1137 prim.Velocity = new LLVector3( 1137 prim.Velocity = new Vector3(
1138 Convert.ToSingle(row["VelocityX"]), 1138 Convert.ToSingle(row["VelocityX"]),
1139 Convert.ToSingle(row["VelocityY"]), 1139 Convert.ToSingle(row["VelocityY"]),
1140 Convert.ToSingle(row["VelocityZ"]) 1140 Convert.ToSingle(row["VelocityZ"])
1141 ); 1141 );
1142 prim.AngularVelocity = new LLVector3( 1142 prim.AngularVelocity = new Vector3(
1143 Convert.ToSingle(row["AngularVelocityX"]), 1143 Convert.ToSingle(row["AngularVelocityX"]),
1144 Convert.ToSingle(row["AngularVelocityY"]), 1144 Convert.ToSingle(row["AngularVelocityY"]),
1145 Convert.ToSingle(row["AngularVelocityZ"]) 1145 Convert.ToSingle(row["AngularVelocityZ"])
1146 ); 1146 );
1147 prim.Acceleration = new LLVector3( 1147 prim.Acceleration = new Vector3(
1148 Convert.ToSingle(row["AccelerationX"]), 1148 Convert.ToSingle(row["AccelerationX"]),
1149 Convert.ToSingle(row["AccelerationY"]), 1149 Convert.ToSingle(row["AccelerationY"]),
1150 Convert.ToSingle(row["AccelerationZ"]) 1150 Convert.ToSingle(row["AccelerationZ"])
1151 ); 1151 );
1152 // quaternions 1152 // quaternions
1153 prim.RotationOffset = new LLQuaternion( 1153 prim.RotationOffset = new Quaternion(
1154 Convert.ToSingle(row["RotationX"]), 1154 Convert.ToSingle(row["RotationX"]),
1155 Convert.ToSingle(row["RotationY"]), 1155 Convert.ToSingle(row["RotationY"]),
1156 Convert.ToSingle(row["RotationZ"]), 1156 Convert.ToSingle(row["RotationZ"]),
1157 Convert.ToSingle(row["RotationW"]) 1157 Convert.ToSingle(row["RotationW"])
1158 ); 1158 );
1159 prim.SitTargetPositionLL = new LLVector3( 1159 prim.SitTargetPositionLL = new Vector3(
1160 Convert.ToSingle(row["SitTargetOffsetX"]), 1160 Convert.ToSingle(row["SitTargetOffsetX"]),
1161 Convert.ToSingle(row["SitTargetOffsetY"]), 1161 Convert.ToSingle(row["SitTargetOffsetY"]),
1162 Convert.ToSingle(row["SitTargetOffsetZ"]) 1162 Convert.ToSingle(row["SitTargetOffsetZ"])
1163 ); 1163 );
1164 prim.SitTargetOrientationLL = new LLQuaternion( 1164 prim.SitTargetOrientationLL = new Quaternion(
1165 Convert.ToSingle(row["SitTargetOrientX"]), 1165 Convert.ToSingle(row["SitTargetOrientX"]),
1166 Convert.ToSingle(row["SitTargetOrientY"]), 1166 Convert.ToSingle(row["SitTargetOrientY"]),
1167 Convert.ToSingle(row["SitTargetOrientZ"]), 1167 Convert.ToSingle(row["SitTargetOrientZ"]),
@@ -1174,14 +1174,14 @@ namespace OpenSim.Data.MySQL
1174 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]); 1174 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
1175 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]); 1175 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
1176 1176
1177 prim.Sound = new LLUUID(row["LoopedSound"].ToString()); 1177 prim.Sound = new UUID(row["LoopedSound"].ToString());
1178 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]); 1178 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
1179 prim.SoundFlags = 1; // If it's persisted at all, it's looped 1179 prim.SoundFlags = 1; // If it's persisted at all, it's looped
1180 1180
1181 if (!row.IsNull("TextureAnimation")) 1181 if (!row.IsNull("TextureAnimation"))
1182 prim.TextureAnimation = (Byte[])row["TextureAnimation"]; 1182 prim.TextureAnimation = (Byte[])row["TextureAnimation"];
1183 1183
1184 prim.RotationalVelocity = new LLVector3( 1184 prim.RotationalVelocity = new Vector3(
1185 Convert.ToSingle(row["OmegaX"]), 1185 Convert.ToSingle(row["OmegaX"]),
1186 Convert.ToSingle(row["OmegaY"]), 1186 Convert.ToSingle(row["OmegaY"]),
1187 Convert.ToSingle(row["OmegaZ"]) 1187 Convert.ToSingle(row["OmegaZ"])
@@ -1190,13 +1190,13 @@ namespace OpenSim.Data.MySQL
1190 // TODO: Rotation 1190 // TODO: Rotation
1191 // OmegaX, OmegaY, OmegaZ 1191 // OmegaX, OmegaY, OmegaZ
1192 1192
1193 prim.SetCameraEyeOffset(new LLVector3( 1193 prim.SetCameraEyeOffset(new Vector3(
1194 Convert.ToSingle(row["CameraEyeOffsetX"]), 1194 Convert.ToSingle(row["CameraEyeOffsetX"]),
1195 Convert.ToSingle(row["CameraEyeOffsetY"]), 1195 Convert.ToSingle(row["CameraEyeOffsetY"]),
1196 Convert.ToSingle(row["CameraEyeOffsetZ"]) 1196 Convert.ToSingle(row["CameraEyeOffsetZ"])
1197 )); 1197 ));
1198 1198
1199 prim.SetCameraAtOffset(new LLVector3( 1199 prim.SetCameraAtOffset(new Vector3(
1200 Convert.ToSingle(row["CameraAtOffsetX"]), 1200 Convert.ToSingle(row["CameraAtOffsetX"]),
1201 Convert.ToSingle(row["CameraAtOffsetY"]), 1201 Convert.ToSingle(row["CameraAtOffsetY"]),
1202 Convert.ToSingle(row["CameraAtOffsetZ"]) 1202 Convert.ToSingle(row["CameraAtOffsetZ"])
@@ -1229,10 +1229,10 @@ namespace OpenSim.Data.MySQL
1229 { 1229 {
1230 TaskInventoryItem taskItem = new TaskInventoryItem(); 1230 TaskInventoryItem taskItem = new TaskInventoryItem();
1231 1231
1232 taskItem.ItemID = new LLUUID((String)row["itemID"]); 1232 taskItem.ItemID = new UUID((String)row["itemID"]);
1233 taskItem.ParentPartID = new LLUUID((String)row["primID"]); 1233 taskItem.ParentPartID = new UUID((String)row["primID"]);
1234 taskItem.AssetID = new LLUUID((String)row["assetID"]); 1234 taskItem.AssetID = new UUID((String)row["assetID"]);
1235 taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); 1235 taskItem.ParentID = new UUID((String)row["parentFolderID"]);
1236 1236
1237 taskItem.InvType = Convert.ToInt32(row["invType"]); 1237 taskItem.InvType = Convert.ToInt32(row["invType"]);
1238 taskItem.Type = Convert.ToInt32(row["assetType"]); 1238 taskItem.Type = Convert.ToInt32(row["assetType"]);
@@ -1240,10 +1240,10 @@ namespace OpenSim.Data.MySQL
1240 taskItem.Name = (String)row["name"]; 1240 taskItem.Name = (String)row["name"];
1241 taskItem.Description = (String)row["description"]; 1241 taskItem.Description = (String)row["description"];
1242 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1242 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1243 taskItem.CreatorID = new LLUUID((String)row["creatorID"]); 1243 taskItem.CreatorID = new UUID((String)row["creatorID"]);
1244 taskItem.OwnerID = new LLUUID((String)row["ownerID"]); 1244 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1245 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1245 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1246 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1246 taskItem.GroupID = new UUID((String)row["groupID"]);
1247 1247
1248 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); 1248 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1249 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); 1249 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
@@ -1259,7 +1259,7 @@ namespace OpenSim.Data.MySQL
1259 { 1259 {
1260 RegionSettings newSettings = new RegionSettings(); 1260 RegionSettings newSettings = new RegionSettings();
1261 1261
1262 newSettings.RegionUUID = new LLUUID((string) row["regionUUID"]); 1262 newSettings.RegionUUID = new UUID((string) row["regionUUID"]);
1263 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]); 1263 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
1264 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]); 1264 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
1265 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]); 1265 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
@@ -1273,10 +1273,10 @@ namespace OpenSim.Data.MySQL
1273 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]); 1273 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
1274 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]); 1274 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
1275 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]); 1275 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
1276 newSettings.TerrainTexture1 = new LLUUID((String) row["terrain_texture_1"]); 1276 newSettings.TerrainTexture1 = new UUID((String) row["terrain_texture_1"]);
1277 newSettings.TerrainTexture2 = new LLUUID((String) row["terrain_texture_2"]); 1277 newSettings.TerrainTexture2 = new UUID((String) row["terrain_texture_2"]);
1278 newSettings.TerrainTexture3 = new LLUUID((String) row["terrain_texture_3"]); 1278 newSettings.TerrainTexture3 = new UUID((String) row["terrain_texture_3"]);
1279 newSettings.TerrainTexture4 = new LLUUID((String) row["terrain_texture_4"]); 1279 newSettings.TerrainTexture4 = new UUID((String) row["terrain_texture_4"]);
1280 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]); 1280 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
1281 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]); 1281 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
1282 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]); 1282 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
@@ -1292,7 +1292,7 @@ namespace OpenSim.Data.MySQL
1292 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); 1292 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
1293 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); 1293 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
1294 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); 1294 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
1295 newSettings.Covenant = new LLUUID((String) row["covenant"]); 1295 newSettings.Covenant = new UUID((String) row["covenant"]);
1296 1296
1297 return newSettings; 1297 return newSettings;
1298 } 1298 }
@@ -1306,7 +1306,7 @@ namespace OpenSim.Data.MySQL
1306 { 1306 {
1307 LandData newData = new LandData(); 1307 LandData newData = new LandData();
1308 1308
1309 newData.GlobalID = new LLUUID((String) row["UUID"]); 1309 newData.GlobalID = new UUID((String) row["UUID"]);
1310 newData.LocalID = Convert.ToInt32(row["LocalLandID"]); 1310 newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
1311 1311
1312 // Bitmap is a byte[512] 1312 // Bitmap is a byte[512]
@@ -1322,39 +1322,39 @@ namespace OpenSim.Data.MySQL
1322 //Enum libsecondlife.Parcel.ParcelCategory 1322 //Enum libsecondlife.Parcel.ParcelCategory
1323 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 1323 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1324 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 1324 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1325 newData.GroupID = new LLUUID((String) row["GroupUUID"]); 1325 newData.GroupID = new UUID((String) row["GroupUUID"]);
1326 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 1326 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1327 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]); 1327 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1328 //Enum. libsecondlife.Parcel.ParcelStatus 1328 //Enum. libsecondlife.Parcel.ParcelStatus
1329 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 1329 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1330 newData.LandingType = Convert.ToByte(row["LandingType"]); 1330 newData.LandingType = Convert.ToByte(row["LandingType"]);
1331 newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]); 1331 newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
1332 newData.MediaID = new LLUUID((String) row["MediaTextureUUID"]); 1332 newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
1333 newData.MediaURL = (String) row["MediaURL"]; 1333 newData.MediaURL = (String) row["MediaURL"];
1334 newData.MusicURL = (String) row["MusicURL"]; 1334 newData.MusicURL = (String) row["MusicURL"];
1335 newData.PassHours = Convert.ToSingle(row["PassHours"]); 1335 newData.PassHours = Convert.ToSingle(row["PassHours"]);
1336 newData.PassPrice = Convert.ToInt32(row["PassPrice"]); 1336 newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
1337 LLUUID authedbuyer = LLUUID.Zero; 1337 UUID authedbuyer = UUID.Zero;
1338 LLUUID snapshotID = LLUUID.Zero; 1338 UUID snapshotID = UUID.Zero;
1339 1339
1340 Helpers.TryParse((string)row["AuthBuyerID"], out authedbuyer); 1340 UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer);
1341 Helpers.TryParse((string)row["SnapshotUUID"], out snapshotID); 1341 UUID.TryParse((string)row["SnapshotUUID"], out snapshotID);
1342 1342
1343 newData.AuthBuyerID = authedbuyer; 1343 newData.AuthBuyerID = authedbuyer;
1344 newData.SnapshotID = snapshotID; 1344 newData.SnapshotID = snapshotID;
1345 try 1345 try
1346 { 1346 {
1347 newData.UserLocation = 1347 newData.UserLocation =
1348 new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), 1348 new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
1349 Convert.ToSingle(row["UserLocationZ"])); 1349 Convert.ToSingle(row["UserLocationZ"]));
1350 newData.UserLookAt = 1350 newData.UserLookAt =
1351 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), 1351 new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
1352 Convert.ToSingle(row["UserLookAtZ"])); 1352 Convert.ToSingle(row["UserLookAtZ"]));
1353 } 1353 }
1354 catch (InvalidCastException) 1354 catch (InvalidCastException)
1355 { 1355 {
1356 newData.UserLocation = LLVector3.Zero; 1356 newData.UserLocation = Vector3.Zero;
1357 newData.UserLookAt = LLVector3.Zero; 1357 newData.UserLookAt = Vector3.Zero;
1358 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 1358 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
1359 } 1359 }
1360 1360
@@ -1371,7 +1371,7 @@ namespace OpenSim.Data.MySQL
1371 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) 1371 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
1372 { 1372 {
1373 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 1373 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1374 entry.AgentID = new LLUUID((string) row["AccessUUID"]); 1374 entry.AgentID = new UUID((string) row["AccessUUID"]);
1375 entry.Flags = (ParcelManager.AccessList) Convert.ToInt32(row["Flags"]); 1375 entry.Flags = (ParcelManager.AccessList) Convert.ToInt32(row["Flags"]);
1376 entry.Time = new DateTime(); 1376 entry.Time = new DateTime();
1377 return entry; 1377 return entry;
@@ -1408,7 +1408,7 @@ namespace OpenSim.Data.MySQL
1408 /// <param name="prim"></param> 1408 /// <param name="prim"></param>
1409 /// <param name="sceneGroupID"></param> 1409 /// <param name="sceneGroupID"></param>
1410 /// <param name="regionUUID"></param> 1410 /// <param name="regionUUID"></param>
1411 private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1411 private void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1412 { 1412 {
1413 row["UUID"] = Util.ToRawUuidString(prim.UUID); 1413 row["UUID"] = Util.ToRawUuidString(prim.UUID);
1414 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1414 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1456,12 +1456,12 @@ namespace OpenSim.Data.MySQL
1456 row["RotationW"] = prim.RotationOffset.W; 1456 row["RotationW"] = prim.RotationOffset.W;
1457 1457
1458 // Sit target 1458 // Sit target
1459 LLVector3 sitTargetPos = prim.SitTargetPositionLL; 1459 Vector3 sitTargetPos = prim.SitTargetPositionLL;
1460 row["SitTargetOffsetX"] = sitTargetPos.X; 1460 row["SitTargetOffsetX"] = sitTargetPos.X;
1461 row["SitTargetOffsetY"] = sitTargetPos.Y; 1461 row["SitTargetOffsetY"] = sitTargetPos.Y;
1462 row["SitTargetOffsetZ"] = sitTargetPos.Z; 1462 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1463 1463
1464 LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; 1464 Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
1465 row["SitTargetOrientW"] = sitTargetOrient.W; 1465 row["SitTargetOrientW"] = sitTargetOrient.W;
1466 row["SitTargetOrientX"] = sitTargetOrient.X; 1466 row["SitTargetOrientX"] = sitTargetOrient.X;
1467 row["SitTargetOrientY"] = sitTargetOrient.Y; 1467 row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1480,7 +1480,7 @@ namespace OpenSim.Data.MySQL
1480 } 1480 }
1481 else 1481 else
1482 { 1482 {
1483 row["LoopedSound"] = LLUUID.Zero; 1483 row["LoopedSound"] = UUID.Zero;
1484 row["LoopedSoundGain"] = 0.0f; 1484 row["LoopedSoundGain"] = 0.0f;
1485 } 1485 }
1486 1486
@@ -1597,7 +1597,7 @@ namespace OpenSim.Data.MySQL
1597 /// <param name="row"></param> 1597 /// <param name="row"></param>
1598 /// <param name="land"></param> 1598 /// <param name="land"></param>
1599 /// <param name="regionUUID"></param> 1599 /// <param name="regionUUID"></param>
1600 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1600 private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
1601 { 1601 {
1602 row["UUID"] = Util.ToRawUuidString(land.GlobalID); 1602 row["UUID"] = Util.ToRawUuidString(land.GlobalID);
1603 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1603 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1642,7 +1642,7 @@ namespace OpenSim.Data.MySQL
1642 /// <param name="row"></param> 1642 /// <param name="row"></param>
1643 /// <param name="entry"></param> 1643 /// <param name="entry"></param>
1644 /// <param name="parcelID"></param> 1644 /// <param name="parcelID"></param>
1645 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) 1645 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
1646 { 1646 {
1647 row["LandUUID"] = Util.ToRawUuidString(parcelID); 1647 row["LandUUID"] = Util.ToRawUuidString(parcelID);
1648 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); 1648 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID);
@@ -1657,7 +1657,7 @@ namespace OpenSim.Data.MySQL
1657 private PrimitiveBaseShape buildShape(DataRow row) 1657 private PrimitiveBaseShape buildShape(DataRow row)
1658 { 1658 {
1659 PrimitiveBaseShape s = new PrimitiveBaseShape(); 1659 PrimitiveBaseShape s = new PrimitiveBaseShape();
1660 s.Scale = new LLVector3( 1660 s.Scale = new Vector3(
1661 Convert.ToSingle(row["ScaleX"]), 1661 Convert.ToSingle(row["ScaleX"]),
1662 Convert.ToSingle(row["ScaleY"]), 1662 Convert.ToSingle(row["ScaleY"]),
1663 Convert.ToSingle(row["ScaleZ"]) 1663 Convert.ToSingle(row["ScaleZ"])
@@ -1778,7 +1778,7 @@ namespace OpenSim.Data.MySQL
1778 /// <param name="prim"></param> 1778 /// <param name="prim"></param>
1779 /// <param name="sceneGroupID"></param> 1779 /// <param name="sceneGroupID"></param>
1780 /// <param name="regionUUID"></param> 1780 /// <param name="regionUUID"></param>
1781 private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1781 private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1782 { 1782 {
1783 lock (m_dataSet) 1783 lock (m_dataSet)
1784 { 1784 {
@@ -1816,7 +1816,7 @@ namespace OpenSim.Data.MySQL
1816 /// </summary> 1816 /// </summary>
1817 /// <param name="primID"></param> 1817 /// <param name="primID"></param>
1818 /// <param name="items"></param> 1818 /// <param name="items"></param>
1819 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 1819 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
1820 { 1820 {
1821 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); 1821 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
1822 1822
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 8d0b177..42983b1 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using MySql.Data.MySqlClient; 37using MySql.Data.MySqlClient;
@@ -221,15 +221,15 @@ namespace OpenSim.Data.MySQL
221 221
222 #region User Friends List Data 222 #region User Friends List Data
223 223
224 public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 224 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
225 { 225 {
226 MySQLSuperManager dbm = GetLockedConnection(); 226 MySQLSuperManager dbm = GetLockedConnection();
227 227
228 int dtvalue = Util.UnixTimeSinceEpoch(); 228 int dtvalue = Util.UnixTimeSinceEpoch();
229 229
230 Dictionary<string, string> param = new Dictionary<string, string>(); 230 Dictionary<string, string> param = new Dictionary<string, string>();
231 param["?ownerID"] = friendlistowner.UUID.ToString(); 231 param["?ownerID"] = friendlistowner.ToString();
232 param["?friendID"] = friend.UUID.ToString(); 232 param["?friendID"] = friend.ToString();
233 param["?friendPerms"] = perms.ToString(); 233 param["?friendPerms"] = perms.ToString();
234 param["?datetimestamp"] = dtvalue.ToString(); 234 param["?datetimestamp"] = dtvalue.ToString();
235 235
@@ -265,13 +265,13 @@ namespace OpenSim.Data.MySQL
265 } 265 }
266 } 266 }
267 267
268 public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 268 public override void RemoveUserFriend(UUID friendlistowner, UUID friend)
269 { 269 {
270 MySQLSuperManager dbm = GetLockedConnection(); 270 MySQLSuperManager dbm = GetLockedConnection();
271 271
272 Dictionary<string, string> param = new Dictionary<string, string>(); 272 Dictionary<string, string> param = new Dictionary<string, string>();
273 param["?ownerID"] = friendlistowner.UUID.ToString(); 273 param["?ownerID"] = friendlistowner.ToString();
274 param["?friendID"] = friend.UUID.ToString(); 274 param["?friendID"] = friend.ToString();
275 275
276 try 276 try
277 { 277 {
@@ -299,13 +299,13 @@ namespace OpenSim.Data.MySQL
299 } 299 }
300 } 300 }
301 301
302 public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 302 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
303 { 303 {
304 MySQLSuperManager dbm = GetLockedConnection(); 304 MySQLSuperManager dbm = GetLockedConnection();
305 305
306 Dictionary<string, string> param = new Dictionary<string, string>(); 306 Dictionary<string, string> param = new Dictionary<string, string>();
307 param["?ownerID"] = friendlistowner.UUID.ToString(); 307 param["?ownerID"] = friendlistowner.ToString();
308 param["?friendID"] = friend.UUID.ToString(); 308 param["?friendID"] = friend.ToString();
309 param["?friendPerms"] = perms.ToString(); 309 param["?friendPerms"] = perms.ToString();
310 310
311 try 311 try
@@ -330,13 +330,13 @@ namespace OpenSim.Data.MySQL
330 } 330 }
331 } 331 }
332 332
333 public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 333 public override List<FriendListItem> GetUserFriendList(UUID friendlistowner)
334 { 334 {
335 MySQLSuperManager dbm = GetLockedConnection(); 335 MySQLSuperManager dbm = GetLockedConnection();
336 List<FriendListItem> Lfli = new List<FriendListItem>(); 336 List<FriendListItem> Lfli = new List<FriendListItem>();
337 337
338 Dictionary<string, string> param = new Dictionary<string, string>(); 338 Dictionary<string, string> param = new Dictionary<string, string>();
339 param["?ownerID"] = friendlistowner.UUID.ToString(); 339 param["?ownerID"] = friendlistowner.ToString();
340 340
341 try 341 try
342 { 342 {
@@ -352,8 +352,8 @@ namespace OpenSim.Data.MySQL
352 while (reader.Read()) 352 while (reader.Read())
353 { 353 {
354 FriendListItem fli = new FriendListItem(); 354 FriendListItem fli = new FriendListItem();
355 fli.FriendListOwner = new LLUUID((string) reader["ownerID"]); 355 fli.FriendListOwner = new UUID((string) reader["ownerID"]);
356 fli.Friend = new LLUUID((string) reader["friendID"]); 356 fli.Friend = new UUID((string) reader["friendID"]);
357 fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]); 357 fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]);
358 358
359 // This is not a real column in the database table, it's a joined column from the opposite record 359 // This is not a real column in the database table, it's a joined column from the opposite record
@@ -381,12 +381,12 @@ namespace OpenSim.Data.MySQL
381 381
382 #endregion 382 #endregion
383 383
384 public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 384 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
385 { 385 {
386 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); 386 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
387 } 387 }
388 388
389 public override List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 389 public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
390 { 390 {
391 MySQLSuperManager dbm = GetLockedConnection(); 391 MySQLSuperManager dbm = GetLockedConnection();
392 392
@@ -413,7 +413,7 @@ namespace OpenSim.Data.MySQL
413 while (reader.Read()) 413 while (reader.Read())
414 { 414 {
415 AvatarPickerAvatar user = new AvatarPickerAvatar(); 415 AvatarPickerAvatar user = new AvatarPickerAvatar();
416 user.AvatarID = new LLUUID((string) reader["UUID"]); 416 user.AvatarID = new UUID((string) reader["UUID"]);
417 user.firstName = (string) reader["username"]; 417 user.firstName = (string) reader["username"];
418 user.lastName = (string) reader["lastname"]; 418 user.lastName = (string) reader["lastname"];
419 returnlist.Add(user); 419 returnlist.Add(user);
@@ -449,7 +449,7 @@ namespace OpenSim.Data.MySQL
449 while (reader.Read()) 449 while (reader.Read())
450 { 450 {
451 AvatarPickerAvatar user = new AvatarPickerAvatar(); 451 AvatarPickerAvatar user = new AvatarPickerAvatar();
452 user.AvatarID = new LLUUID((string) reader["UUID"]); 452 user.AvatarID = new UUID((string) reader["UUID"]);
453 user.firstName = (string) reader["username"]; 453 user.firstName = (string) reader["username"];
454 user.lastName = (string) reader["lastname"]; 454 user.lastName = (string) reader["lastname"];
455 returnlist.Add(user); 455 returnlist.Add(user);
@@ -476,7 +476,7 @@ namespace OpenSim.Data.MySQL
476 /// </summary> 476 /// </summary>
477 /// <param name="uuid">User UUID</param> 477 /// <param name="uuid">User UUID</param>
478 /// <returns>User profile data</returns> 478 /// <returns>User profile data</returns>
479 public override UserProfileData GetUserByUUID(LLUUID uuid) 479 public override UserProfileData GetUserByUUID(UUID uuid)
480 { 480 {
481 MySQLSuperManager dbm = GetLockedConnection(); 481 MySQLSuperManager dbm = GetLockedConnection();
482 try 482 try
@@ -533,13 +533,13 @@ namespace OpenSim.Data.MySQL
533 /// <param name="AgentID"></param> 533 /// <param name="AgentID"></param>
534 /// <param name="WebLoginKey"></param> 534 /// <param name="WebLoginKey"></param>
535 /// <remarks>is it still used ?</remarks> 535 /// <remarks>is it still used ?</remarks>
536 public override void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 536 public override void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
537 { 537 {
538 MySQLSuperManager dbm = GetLockedConnection(); 538 MySQLSuperManager dbm = GetLockedConnection();
539 539
540 Dictionary<string, string> param = new Dictionary<string, string>(); 540 Dictionary<string, string> param = new Dictionary<string, string>();
541 param["?UUID"] = AgentID.UUID.ToString(); 541 param["?UUID"] = AgentID.ToString();
542 param["?webLoginKey"] = WebLoginKey.UUID.ToString(); 542 param["?webLoginKey"] = WebLoginKey.ToString();
543 543
544 try 544 try
545 { 545 {
@@ -565,7 +565,7 @@ namespace OpenSim.Data.MySQL
565 /// </summary> 565 /// </summary>
566 /// <param name="uuid">The accounts UUID</param> 566 /// <param name="uuid">The accounts UUID</param>
567 /// <returns>The users session</returns> 567 /// <returns>The users session</returns>
568 public override UserAgentData GetAgentByUUID(LLUUID uuid) 568 public override UserAgentData GetAgentByUUID(UUID uuid)
569 { 569 {
570 MySQLSuperManager dbm = GetLockedConnection(); 570 MySQLSuperManager dbm = GetLockedConnection();
571 571
@@ -682,7 +682,7 @@ namespace OpenSim.Data.MySQL
682 /// <param name="to">The receivers account ID</param> 682 /// <param name="to">The receivers account ID</param>
683 /// <param name="amount">The amount to transfer</param> 683 /// <param name="amount">The amount to transfer</param>
684 /// <returns>Success?</returns> 684 /// <returns>Success?</returns>
685 public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 685 public override bool MoneyTransferRequest(UUID from, UUID to, uint amount)
686 { 686 {
687 return false; 687 return false;
688 } 688 }
@@ -695,7 +695,7 @@ namespace OpenSim.Data.MySQL
695 /// <param name="to">The receivers account ID</param> 695 /// <param name="to">The receivers account ID</param>
696 /// <param name="item">The item to transfer</param> 696 /// <param name="item">The item to transfer</param>
697 /// <returns>Success?</returns> 697 /// <returns>Success?</returns>
698 public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 698 public override bool InventoryTransferRequest(UUID from, UUID to, UUID item)
699 { 699 {
700 return false; 700 return false;
701 } 701 }
@@ -705,7 +705,7 @@ namespace OpenSim.Data.MySQL
705 /// TODO: stubs for now to get us to a compiling state gently 705 /// TODO: stubs for now to get us to a compiling state gently
706 /// override 706 /// override
707 /// </summary> 707 /// </summary>
708 public override AvatarAppearance GetUserAppearance(LLUUID user) 708 public override AvatarAppearance GetUserAppearance(UUID user)
709 { 709 {
710 MySQLSuperManager dbm = GetLockedConnection(); 710 MySQLSuperManager dbm = GetLockedConnection();
711 try 711 try
@@ -744,7 +744,7 @@ namespace OpenSim.Data.MySQL
744 /// <param name="user">The user UUID</param> 744 /// <param name="user">The user UUID</param>
745 /// <param name="appearance">The avatar appearance</param> 745 /// <param name="appearance">The avatar appearance</param>
746 // override 746 // override
747 public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 747 public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
748 { 748 {
749 MySQLSuperManager dbm = GetLockedConnection(); 749 MySQLSuperManager dbm = GetLockedConnection();
750 try 750 try
@@ -783,7 +783,7 @@ namespace OpenSim.Data.MySQL
783 get { return "0.1"; } 783 get { return "0.1"; }
784 } 784 }
785 785
786 public Hashtable GetUserAttachments(LLUUID agentID) 786 public Hashtable GetUserAttachments(UUID agentID)
787 { 787 {
788 MySQLSuperManager dbm = GetLockedConnection(); 788 MySQLSuperManager dbm = GetLockedConnection();
789 789
@@ -814,7 +814,7 @@ namespace OpenSim.Data.MySQL
814 } 814 }
815 } 815 }
816 816
817 public void UpdateUserAttachments(LLUUID agentID, Hashtable data) 817 public void UpdateUserAttachments(UUID agentID, Hashtable data)
818 { 818 {
819 MySQLSuperManager dbm = GetLockedConnection(); 819 MySQLSuperManager dbm = GetLockedConnection();
820 try 820 try
@@ -827,7 +827,7 @@ namespace OpenSim.Data.MySQL
827 } 827 }
828 } 828 }
829 829
830 public override void ResetAttachments(LLUUID userID) 830 public override void ResetAttachments(UUID userID)
831 { 831 {
832 MySQLSuperManager dbm = GetLockedConnection(); 832 MySQLSuperManager dbm = GetLockedConnection();
833 833
@@ -847,4 +847,4 @@ namespace OpenSim.Data.MySQL
847 } 847 }
848 } 848 }
849 } 849 }
850} \ No newline at end of file 850}
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
index 80fb9ff..7431433 100644
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using NHibernate; 31using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class LLQuaternionUserType: IUserType 38 public class QuaternionUserType: IUserType
39 { 39 {
40 public object Assemble(object cached, object owner) 40 public object Assemble(object cached, object owner)
41 { 41 {
@@ -49,9 +49,8 @@ namespace OpenSim.Data.NHibernate
49 49
50 public object DeepCopy(object quat) 50 public object DeepCopy(object quat)
51 { 51 {
52 // silly libsecondlife having no copy constructor 52 Quaternion q = (Quaternion)quat;
53 LLQuaternion q = (LLQuaternion) quat; 53 return new Quaternion(q);
54 return new LLQuaternion(q.X, q.Y, q.Z, q.W);
55 } 54 }
56 55
57 public object Disassemble(object quat) 56 public object Disassemble(object quat)
@@ -79,14 +78,14 @@ namespace OpenSim.Data.NHibernate
79 int w = rs.GetOrdinal(names[3]); 78 int w = rs.GetOrdinal(names[3]);
80 if (!rs.IsDBNull(x)) 79 if (!rs.IsDBNull(x))
81 { 80 {
82 quat = new LLQuaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]); 81 quat = new Quaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]);
83 } 82 }
84 return quat; 83 return quat;
85 } 84 }
86 85
87 public void NullSafeSet(IDbCommand cmd, object obj, int index) 86 public void NullSafeSet(IDbCommand cmd, object obj, int index)
88 { 87 {
89 LLQuaternion quat = (LLQuaternion)obj; 88 Quaternion quat = (Quaternion)obj;
90 ((IDataParameter)cmd.Parameters[index]).Value = quat.X; 89 ((IDataParameter)cmd.Parameters[index]).Value = quat.X;
91 ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y; 90 ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y;
92 ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z; 91 ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z;
@@ -100,7 +99,7 @@ namespace OpenSim.Data.NHibernate
100 99
101 public Type ReturnedType 100 public Type ReturnedType
102 { 101 {
103 get { return typeof(LLQuaternion); } 102 get { return typeof(Quaternion); }
104 } 103 }
105 104
106 public SqlType[] SqlTypes 105 public SqlType[] SqlTypes
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
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using NHibernate; 31using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
35namespace OpenSim.Data.NHibernate 35namespace 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
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index d2df2c4..cdd15ec 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using NHibernate; 31using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class LLVector3UserType: IUserType 38 public class Vector3UserType: IUserType
39 { 39 {
40 public object Assemble(object cached, object owner) 40 public object Assemble(object cached, object owner)
41 { 41 {
@@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate
49 49
50 public object DeepCopy(object vector) 50 public object DeepCopy(object vector)
51 { 51 {
52 return new LLVector3((LLVector3) vector); 52 return new Vector3((Vector3) vector);
53 } 53 }
54 54
55 public object Disassemble(object vector) 55 public object Disassemble(object vector)
@@ -76,14 +76,14 @@ namespace OpenSim.Data.NHibernate
76 int z = rs.GetOrdinal(names[2]); 76 int z = rs.GetOrdinal(names[2]);
77 if (!rs.IsDBNull(x)) 77 if (!rs.IsDBNull(x))
78 { 78 {
79 vector = new LLVector3((Single)rs[x], (Single)rs[y], (Single)rs[z]); 79 vector = new Vector3((Single)rs[x], (Single)rs[y], (Single)rs[z]);
80 } 80 }
81 return vector; 81 return vector;
82 } 82 }
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 LLVector3 vector = (LLVector3)obj; 86 Vector3 vector = (Vector3)obj;
87 ((IDataParameter)cmd.Parameters[index]).Value = vector.X; 87 ((IDataParameter)cmd.Parameters[index]).Value = vector.X;
88 ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y; 88 ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y;
89 ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z; 89 ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z;
@@ -96,7 +96,7 @@ namespace OpenSim.Data.NHibernate
96 96
97 public Type ReturnedType 97 public Type ReturnedType
98 { 98 {
99 get { return typeof(LLVector3); } 99 get { return typeof(Vector3); }
100 } 100 }
101 101
102 public SqlType[] SqlTypes 102 public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 400451f..6ee527e 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using NHibernate; 35using NHibernate;
36using NHibernate.Cfg; 36using NHibernate.Cfg;
@@ -101,7 +101,7 @@ namespace OpenSim.Data.NHibernate
101 101
102 } 102 }
103 103
104 override public AssetBase FetchAsset(LLUUID uuid) 104 override public AssetBase FetchAsset(UUID uuid)
105 { 105 {
106 try 106 try
107 { 107 {
@@ -163,13 +163,13 @@ namespace OpenSim.Data.NHibernate
163 // asset.InvType, temporary, local, assetLength)); 163 // asset.InvType, temporary, local, assetLength));
164 // } 164 // }
165 165
166 override public bool ExistsAsset(LLUUID uuid) 166 override public bool ExistsAsset(UUID uuid)
167 { 167 {
168 m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid); 168 m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
169 return (FetchAsset(uuid) != null); 169 return (FetchAsset(uuid) != null);
170 } 170 }
171 171
172 public void DeleteAsset(LLUUID uuid) 172 public void DeleteAsset(UUID uuid)
173 { 173 {
174 174
175 } 175 }
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 657a7b2..20dad1a 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using NHibernate; 35using NHibernate;
36using NHibernate.Cfg; 36using NHibernate.Cfg;
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
105 /// </summary> 105 /// </summary>
106 /// <param name="item">The UUID of the item to be returned</param> 106 /// <param name="item">The UUID of the item to be returned</param>
107 /// <returns>A class containing item information</returns> 107 /// <returns>A class containing item information</returns>
108 public InventoryItemBase getInventoryItem(LLUUID item) 108 public InventoryItemBase getInventoryItem(UUID item)
109 { 109 {
110 try 110 try
111 { 111 {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.NHibernate
163 /// 163 ///
164 /// </summary> 164 /// </summary>
165 /// <param name="item"></param> 165 /// <param name="item"></param>
166 public void deleteInventoryItem(LLUUID itemID) 166 public void deleteInventoryItem(UUID itemID)
167 { 167 {
168 using (ITransaction transaction = session.BeginTransaction()) 168 using (ITransaction transaction = session.BeginTransaction())
169 { 169 {
@@ -177,7 +177,7 @@ namespace OpenSim.Data.NHibernate
177 /// </summary> 177 /// </summary>
178 /// <param name="folder">The UUID of the folder to be returned</param> 178 /// <param name="folder">The UUID of the folder to be returned</param>
179 /// <returns>A class containing folder information</returns> 179 /// <returns>A class containing folder information</returns>
180 public InventoryFolderBase getInventoryFolder(LLUUID folder) 180 public InventoryFolderBase getInventoryFolder(UUID folder)
181 { 181 {
182 try 182 try
183 { 183 {
@@ -235,7 +235,7 @@ namespace OpenSim.Data.NHibernate
235 /// 235 ///
236 /// </summary> 236 /// </summary>
237 /// <param name="folder"></param> 237 /// <param name="folder"></param>
238 public void deleteInventoryFolder(LLUUID folderID) 238 public void deleteInventoryFolder(UUID folderID)
239 { 239 {
240 using (ITransaction transaction = session.BeginTransaction()) 240 using (ITransaction transaction = session.BeginTransaction())
241 { 241 {
@@ -245,12 +245,12 @@ namespace OpenSim.Data.NHibernate
245 } 245 }
246 246
247 // useful private methods 247 // useful private methods
248 private bool ExistsItem(LLUUID uuid) 248 private bool ExistsItem(UUID uuid)
249 { 249 {
250 return (getInventoryItem(uuid) != null) ? true : false; 250 return (getInventoryItem(uuid) != null) ? true : false;
251 } 251 }
252 252
253 private bool ExistsFolder(LLUUID uuid) 253 private bool ExistsFolder(UUID uuid)
254 { 254 {
255 return (getInventoryFolder(uuid) != null) ? true : false; 255 return (getInventoryFolder(uuid) != null) ? true : false;
256 } 256 }
@@ -314,7 +314,7 @@ namespace OpenSim.Data.NHibernate
314 /// </summary> 314 /// </summary>
315 /// <param name="folderID">The UUID of the target folder</param> 315 /// <param name="folderID">The UUID of the target folder</param>
316 /// <returns>A List of InventoryItemBase items</returns> 316 /// <returns>A List of InventoryItemBase items</returns>
317 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 317 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
318 { 318 {
319 // try { 319 // try {
320 ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase)); 320 ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase));
@@ -332,16 +332,16 @@ namespace OpenSim.Data.NHibernate
332 // } 332 // }
333 } 333 }
334 334
335 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 335 public List<InventoryFolderBase> getUserRootFolders(UUID user)
336 { 336 {
337 return new List<InventoryFolderBase>(); 337 return new List<InventoryFolderBase>();
338 } 338 }
339 339
340 // see InventoryItemBase.getUserRootFolder 340 // see InventoryItemBase.getUserRootFolder
341 public InventoryFolderBase getUserRootFolder(LLUUID user) 341 public InventoryFolderBase getUserRootFolder(UUID user)
342 { 342 {
343 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); 343 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
344 criteria.Add(Expression.Eq("ParentID", LLUUID.Zero)); 344 criteria.Add(Expression.Eq("ParentID", UUID.Zero));
345 criteria.Add(Expression.Eq("Owner", user)); 345 criteria.Add(Expression.Eq("Owner", user));
346 foreach (InventoryFolderBase folder in criteria.List()) 346 foreach (InventoryFolderBase folder in criteria.List())
347 { 347 {
@@ -356,7 +356,7 @@ namespace OpenSim.Data.NHibernate
356 /// </summary> 356 /// </summary>
357 /// <param name="folders">list where folders will be appended</param> 357 /// <param name="folders">list where folders will be appended</param>
358 /// <param name="parentID">ID of parent</param> 358 /// <param name="parentID">ID of parent</param>
359 private void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 359 private void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
360 { 360 {
361 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); 361 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
362 criteria.Add(Expression.Eq("ParentID", parentID)); 362 criteria.Add(Expression.Eq("ParentID", parentID));
@@ -371,7 +371,7 @@ namespace OpenSim.Data.NHibernate
371 /// </summary> 371 /// </summary>
372 /// <param name="parentID">The folder to get subfolders for</param> 372 /// <param name="parentID">The folder to get subfolders for</param>
373 /// <returns>A list of inventory folders</returns> 373 /// <returns>A list of inventory folders</returns>
374 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 374 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
375 { 375 {
376 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 376 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
377 getInventoryFolders(ref folders, parentID); 377 getInventoryFolders(ref folders, parentID);
@@ -379,7 +379,7 @@ namespace OpenSim.Data.NHibernate
379 } 379 }
380 380
381 // See IInventoryDataPlugin 381 // See IInventoryDataPlugin
382 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 382 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
383 { 383 {
384 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 384 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
385 getInventoryFolders(ref folders, parentID); 385 getInventoryFolders(ref folders, parentID);
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 9682d87..07bf05c 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using NHibernate; 36using NHibernate;
37using NHibernate.Cfg; 37using NHibernate.Cfg;
@@ -109,7 +109,7 @@ namespace OpenSim.Data.NHibernate
109 { 109 {
110 } 110 }
111 111
112 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 112 public RegionSettings LoadRegionSettings(UUID regionUUID)
113 { 113 {
114 return null; 114 return null;
115 } 115 }
@@ -162,7 +162,7 @@ namespace OpenSim.Data.NHibernate
162 /// </summary> 162 /// </summary>
163 /// <param name="obj">the object</param> 163 /// <param name="obj">the object</param>
164 /// <param name="regionUUID">the region UUID</param> 164 /// <param name="regionUUID">the region UUID</param>
165 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 165 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
166 { 166 {
167 try 167 try
168 { 168 {
@@ -179,7 +179,7 @@ namespace OpenSim.Data.NHibernate
179 } 179 }
180 } 180 }
181 181
182 private SceneObjectGroup LoadObject(LLUUID uuid, LLUUID region) 182 private SceneObjectGroup LoadObject(UUID uuid, UUID region)
183 { 183 {
184 SceneObjectGroup group = new SceneObjectGroup(); 184 SceneObjectGroup group = new SceneObjectGroup();
185 185
@@ -210,7 +210,7 @@ namespace OpenSim.Data.NHibernate
210 /// </summary> 210 /// </summary>
211 /// <param name="obj">the object</param> 211 /// <param name="obj">the object</param>
212 /// <param name="regionUUID">the region UUID</param> 212 /// <param name="regionUUID">the region UUID</param>
213 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 213 public void RemoveObject(UUID obj, UUID regionUUID)
214 { 214 {
215 SceneObjectGroup g = LoadObject(obj, regionUUID); 215 SceneObjectGroup g = LoadObject(obj, regionUUID);
216 foreach (SceneObjectPart p in g.Children.Values) 216 foreach (SceneObjectPart p in g.Children.Values)
@@ -219,7 +219,7 @@ namespace OpenSim.Data.NHibernate
219 } 219 }
220 session.Flush(); 220 session.Flush();
221 221
222 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 222 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
223 223
224 } 224 }
225 225
@@ -228,9 +228,9 @@ namespace OpenSim.Data.NHibernate
228 /// </summary> 228 /// </summary>
229 /// <param name="regionUUID">The region UUID</param> 229 /// <param name="regionUUID">The region UUID</param>
230 /// <returns>List of loaded groups</returns> 230 /// <returns>List of loaded groups</returns>
231 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 231 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
232 { 232 {
233 Dictionary<LLUUID, SceneObjectGroup> SOG = new Dictionary<LLUUID, SceneObjectGroup>(); 233 Dictionary<UUID, SceneObjectGroup> SOG = new Dictionary<UUID, SceneObjectGroup>();
234 List<SceneObjectGroup> ret = new List<SceneObjectGroup>(); 234 List<SceneObjectGroup> ret = new List<SceneObjectGroup>();
235 235
236 ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart)); 236 ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart));
@@ -276,7 +276,7 @@ namespace OpenSim.Data.NHibernate
276 /// </summary> 276 /// </summary>
277 /// <param name="ter">terrain heightfield</param> 277 /// <param name="ter">terrain heightfield</param>
278 /// <param name="regionID">region UUID</param> 278 /// <param name="regionID">region UUID</param>
279 public void StoreTerrain(double[,] ter, LLUUID regionID) 279 public void StoreTerrain(double[,] ter, UUID regionID)
280 { 280 {
281 lock (this) { 281 lock (this) {
282 Terrain t = new Terrain(regionID, ter); 282 Terrain t = new Terrain(regionID, ter);
@@ -289,7 +289,7 @@ namespace OpenSim.Data.NHibernate
289 /// </summary> 289 /// </summary>
290 /// <param name="regionID">the region UUID</param> 290 /// <param name="regionID">the region UUID</param>
291 /// <returns>Heightfield data</returns> 291 /// <returns>Heightfield data</returns>
292 public double[,] LoadTerrain(LLUUID regionID) 292 public double[,] LoadTerrain(UUID regionID)
293 { 293 {
294 try 294 try
295 { 295 {
@@ -307,7 +307,7 @@ namespace OpenSim.Data.NHibernate
307 /// 307 ///
308 /// </summary> 308 /// </summary>
309 /// <param name="globalID"></param> 309 /// <param name="globalID"></param>
310 public void RemoveLandObject(LLUUID globalID) 310 public void RemoveLandObject(UUID globalID)
311 { 311 {
312 312
313 } 313 }
@@ -326,7 +326,7 @@ namespace OpenSim.Data.NHibernate
326 /// </summary> 326 /// </summary>
327 /// <param name="regionUUID"></param> 327 /// <param name="regionUUID"></param>
328 /// <returns></returns> 328 /// <returns></returns>
329 public List<LandData> LoadLandObjects(LLUUID regionUUID) 329 public List<LandData> LoadLandObjects(UUID regionUUID)
330 { 330 {
331 List<LandData> landDataForRegion = new List<LandData>(); 331 List<LandData> landDataForRegion = new List<LandData>();
332 332
@@ -347,7 +347,7 @@ namespace OpenSim.Data.NHibernate
347 /// </summary> 347 /// </summary>
348 /// <param name="regionUUID">the region UUID</param> 348 /// <param name="regionUUID">the region UUID</param>
349 /// <returns>The banlist</returns> 349 /// <returns>The banlist</returns>
350 public List<EstateBan> LoadRegionBanList(LLUUID regionUUID) 350 public List<EstateBan> LoadRegionBanList(UUID regionUUID)
351 { 351 {
352 List<EstateBan> regionbanlist = new List<EstateBan>(); 352 List<EstateBan> regionbanlist = new List<EstateBan>();
353 353
@@ -395,7 +395,7 @@ namespace OpenSim.Data.NHibernate
395 /// </summary> 395 /// </summary>
396 /// <param name="primID"></param> 396 /// <param name="primID"></param>
397 /// <param name="items"></param> 397 /// <param name="items"></param>
398 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 398 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
399 { 399 {
400 ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem)); 400 ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem));
401 criteria.Add(Expression.Eq("ParentPartID", primID)); 401 criteria.Add(Expression.Eq("ParentPartID", primID));
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 8435762..459b8e7 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using NHibernate; 35using NHibernate;
36using NHibernate.Cfg; 36using NHibernate.Cfg;
@@ -90,7 +90,7 @@ namespace OpenSim.Data.NHibernate
90 m.Update(); 90 m.Update();
91 } 91 }
92 92
93 private bool ExistsUser(LLUUID uuid) 93 private bool ExistsUser(UUID uuid)
94 { 94 {
95 UserProfileData user = null; 95 UserProfileData user = null;
96 try 96 try
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
105 return (user != null); 105 return (user != null);
106 } 106 }
107 107
108 override public UserProfileData GetUserByUUID(LLUUID uuid) 108 override public UserProfileData GetUserByUUID(UUID uuid)
109 { 109 {
110 UserProfileData user; 110 UserProfileData user;
111 // TODO: I'm sure I'll have to do something silly here 111 // TODO: I'm sure I'll have to do something silly here
@@ -136,7 +136,7 @@ namespace OpenSim.Data.NHibernate
136 } 136 }
137 } 137 }
138 138
139 private void SetAgentData(LLUUID uuid, UserAgentData agent) 139 private void SetAgentData(UUID uuid, UserAgentData agent)
140 { 140 {
141 if (agent == null) 141 if (agent == null)
142 { 142 {
@@ -190,7 +190,7 @@ namespace OpenSim.Data.NHibernate
190 session.Update(agent); 190 session.Update(agent);
191 } 191 }
192 192
193 override public UserAgentData GetAgentByUUID(LLUUID uuid) 193 override public UserAgentData GetAgentByUUID(UUID uuid)
194 { 194 {
195 try 195 try
196 { 196 {
@@ -225,7 +225,7 @@ namespace OpenSim.Data.NHibernate
225 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); 225 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
226 } 226 }
227 227
228 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 228 override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
229 { 229 {
230 List<AvatarPickerAvatar> results = new List<AvatarPickerAvatar>(); 230 List<AvatarPickerAvatar> results = new List<AvatarPickerAvatar>();
231 string[] querysplit; 231 string[] querysplit;
@@ -249,18 +249,18 @@ namespace OpenSim.Data.NHibernate
249 } 249 }
250 250
251 // TODO: actually implement these 251 // TODO: actually implement these
252 public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; } 252 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; }
253 public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) { return; } 253 public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; }
254 public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } 254 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; }
255 public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { return; } 255 public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; }
256 public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } 256 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) { return; }
257 public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) { return new List<FriendListItem>(); } 257 public override List<FriendListItem> GetUserFriendList(UUID friendlistowner) { return new List<FriendListItem>(); }
258 public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) { return true; } 258 public override bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return true; }
259 public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory) { return true; } 259 public override bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return true; }
260 260
261 /// Appearance 261 /// Appearance
262 /// TODO: stubs for now to get us to a compiling state gently 262 /// TODO: stubs for now to get us to a compiling state gently
263 public override AvatarAppearance GetUserAppearance(LLUUID user) 263 public override AvatarAppearance GetUserAppearance(UUID user)
264 { 264 {
265 AvatarAppearance appearance; 265 AvatarAppearance appearance;
266 // TODO: I'm sure I'll have to do something silly here 266 // TODO: I'm sure I'll have to do something silly here
@@ -272,7 +272,7 @@ namespace OpenSim.Data.NHibernate
272 return appearance; 272 return appearance;
273 } 273 }
274 274
275 private bool ExistsAppearance(LLUUID uuid) 275 private bool ExistsAppearance(UUID uuid)
276 { 276 {
277 AvatarAppearance appearance; 277 AvatarAppearance appearance;
278 try { 278 try {
@@ -285,7 +285,7 @@ namespace OpenSim.Data.NHibernate
285 } 285 }
286 286
287 287
288 public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 288 public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
289 { 289 {
290 if (appearance == null) 290 if (appearance == null)
291 return; 291 return;
@@ -303,7 +303,7 @@ namespace OpenSim.Data.NHibernate
303 } 303 }
304 } 304 }
305 305
306 public override void ResetAttachments(LLUUID userID) 306 public override void ResetAttachments(UUID userID)
307 { 307 {
308 } 308 }
309 309
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index f6b648a..7c3d8cf 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false"> 3 <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
4 <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="Type" type="System.SByte" /> 7 <property name="Type" type="System.SByte" />
@@ -11,4 +11,4 @@
11 <property name="Temporary" type="boolean" /> 11 <property name="Temporary" type="boolean" />
12 <property name="Data" type="binary" /> 12 <property name="Data" type="binary" />
13 </class> 13 </class>
14</hibernate-mapping> \ No newline at end of file 14</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
index 6d918fe..6afe9fa 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
@@ -1,13 +1,13 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false"> 3 <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false">
4 <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="Type" type="Int16" /> 7 <property name="Type" type="Int16" />
8 <property name="Version" type="System.UInt16" /> 8 <property name="Version" type="System.UInt16" />
9 <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 9 <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
10 <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="Name" type="String" length="64" /> 11 <property name="Name" type="String" length="64" />
12 </class> 12 </class>
13</hibernate-mapping> \ No newline at end of file 13</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
index f1b4007..9a4d7ca 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
@@ -1,26 +1,26 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false"> 3 <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false">
4 <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="InvType" type="System.Int32" /> 7 <property name="InvType" type="System.Int32" />
8 <property name="AssetType" type="System.Int32" /> 8 <property name="AssetType" type="System.Int32" />
9 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 9 <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
10 <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="Creator" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 12 <property name="Creator" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
13 <property name="Name" type="String" length="64" /> 13 <property name="Name" type="String" length="64" />
14 <property name="Description" type="String" length="64" /> 14 <property name="Description" type="String" length="64" />
15 <property name="NextPermissions" type="System.UInt32" /> 15 <property name="NextPermissions" type="System.UInt32" />
16 <property name="CurrentPermissions" type="System.UInt32" /> 16 <property name="CurrentPermissions" type="System.UInt32" />
17 <property name="BasePermissions" type="System.UInt32" /> 17 <property name="BasePermissions" type="System.UInt32" />
18 <property name="EveryOnePermissions" type="System.UInt32" /> 18 <property name="EveryOnePermissions" type="System.UInt32" />
19 <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 19 <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
20 <property name="GroupOwned" type="boolean" /> 20 <property name="GroupOwned" type="boolean" />
21 <property name="SalePrice" type="System.Int32" /> 21 <property name="SalePrice" type="System.Int32" />
22 <property name="SaleType" type="System.Byte" /> 22 <property name="SaleType" type="System.Byte" />
23 <property name="Flags" type="System.UInt32" /> 23 <property name="Flags" type="System.UInt32" />
24 <property name="CreationDate" type="System.Int32" /> 24 <property name="CreationDate" type="System.Int32" />
25 </class> 25 </class>
26</hibernate-mapping> \ No newline at end of file 26</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index ef3ab9b..fe055bb 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -1,12 +1,12 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false"> 3 <class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false">
4 <id name="UUID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="UUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="ParentID" type="System.UInt32"/> 7 <property name="ParentID" type="System.UInt32"/>
8 <property name="ParentUUID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 8 <property name="ParentUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
9 <property name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 9 <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
10 <property name="CreationDate" type="System.Int32" /> 10 <property name="CreationDate" type="System.Int32" />
11 <property name="Name" type="String" length="255" /> 11 <property name="Name" type="String" length="255" />
12 <property name="Text" type="String" length="255" /> 12 <property name="Text" type="String" length="255" />
@@ -15,10 +15,10 @@
15 <property name="TouchName" type="String" length="255" /> 15 <property name="TouchName" type="String" length="255" />
16 16
17 <property name="ObjectFlags" type="System.UInt32" /> 17 <property name="ObjectFlags" type="System.UInt32" />
18 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 18 <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
19 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 19 <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
20 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 20 <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
21 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 21 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
22 22
23 <property name="OwnerMask" type="System.UInt32" /> 23 <property name="OwnerMask" type="System.UInt32" />
24 <property name="NextOwnerMask" type="System.UInt32" /> 24 <property name="NextOwnerMask" type="System.UInt32" />
@@ -26,50 +26,50 @@
26 <property name="EveryoneMask" type="System.UInt32" /> 26 <property name="EveryoneMask" type="System.UInt32" />
27 <property name="BaseMask" type="System.UInt32" /> 27 <property name="BaseMask" type="System.UInt32" />
28 28
29 <property name="OffsetPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 29 <property name="OffsetPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
30 <column name="PositionX" /> 30 <column name="PositionX" />
31 <column name="PositionY" /> 31 <column name="PositionY" />
32 <column name="PositionZ" /> 32 <column name="PositionZ" />
33 </property> 33 </property>
34 34
35 <property name="GroupPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 35 <property name="GroupPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
36 <column name="GroupPositionX" /> 36 <column name="GroupPositionX" />
37 <column name="GroupPositionY" /> 37 <column name="GroupPositionY" />
38 <column name="GroupPositionZ" /> 38 <column name="GroupPositionZ" />
39 </property> 39 </property>
40 40
41 <property name="Velocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 41 <property name="Velocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
42 <column name="VelocityX" /> 42 <column name="VelocityX" />
43 <column name="VelocityY" /> 43 <column name="VelocityY" />
44 <column name="VelocityZ" /> 44 <column name="VelocityZ" />
45 </property> 45 </property>
46 46
47 <property name="AngularVelocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 47 <property name="AngularVelocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
48 <column name="AngularVelocityX" /> 48 <column name="AngularVelocityX" />
49 <column name="AngularVelocityY" /> 49 <column name="AngularVelocityY" />
50 <column name="AngularVelocityZ" /> 50 <column name="AngularVelocityZ" />
51 </property> 51 </property>
52 52
53 <property name="Acceleration" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 53 <property name="Acceleration" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
54 <column name="AccelerationX" /> 54 <column name="AccelerationX" />
55 <column name="AccelerationY" /> 55 <column name="AccelerationY" />
56 <column name="AccelerationZ" /> 56 <column name="AccelerationZ" />
57 </property> 57 </property>
58 58
59 <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 59 <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
60 <column name="SitTargetOffsetX" /> 60 <column name="SitTargetOffsetX" />
61 <column name="SitTargetOffsetY" /> 61 <column name="SitTargetOffsetY" />
62 <column name="SitTargetOffsetZ" /> 62 <column name="SitTargetOffsetZ" />
63 </property> 63 </property>
64 64
65 <property name="RotationOffset" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" > 65 <property name="RotationOffset" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
66 <column name="RotationX" /> 66 <column name="RotationX" />
67 <column name="RotationY" /> 67 <column name="RotationY" />
68 <column name="RotationZ" /> 68 <column name="RotationZ" />
69 <column name="RotationW" /> 69 <column name="RotationW" />
70 </property> 70 </property>
71 71
72 <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" > 72 <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
73 <column name="SitTargetOrientX" /> 73 <column name="SitTargetOrientX" />
74 <column name="SitTargetOrientY" /> 74 <column name="SitTargetOrientY" />
75 <column name="SitTargetOrientZ" /> 75 <column name="SitTargetOrientZ" />
@@ -77,7 +77,7 @@
77 </property> 77 </property>
78 78
79 <component name="Shape"> 79 <component name="Shape">
80 <property name="Scale" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 80 <property name="Scale" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
81 <column name="ScaleX" /> 81 <column name="ScaleX" />
82 <column name="ScaleY" /> 82 <column name="ScaleY" />
83 <column name="ScaleZ" /> 83 <column name="ScaleZ" />
@@ -105,22 +105,22 @@
105 </component> 105 </component>
106 </class> 106 </class>
107 <class name="OpenSim.Data.NHibernate.Terrain, OpenSim.Data.NHibernate" table="Terrain" lazy="false"> 107 <class name="OpenSim.Data.NHibernate.Terrain, OpenSim.Data.NHibernate" table="Terrain" lazy="false">
108 <id name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 108 <id name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
109 <generator class="assigned" /> 109 <generator class="assigned" />
110 </id> 110 </id>
111 <property name="Map" type="System.Byte[]" /> 111 <property name="Map" type="System.Byte[]" />
112 </class> 112 </class>
113 <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false"> 113 <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false">
114 <id name="ItemID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 114 <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
115 <generator class="assigned" /> 115 <generator class="assigned" />
116 </id> 116 </id>
117 <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 117 <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
118 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 118 <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
119 <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 119 <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
120 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 120 <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
121 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 121 <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
122 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 122 <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
123 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 123 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
124 <property name="CurrentPermissions" type="System.UInt32" /> 124 <property name="CurrentPermissions" type="System.UInt32" />
125 <property name="BasePermissions" type="System.UInt32" /> 125 <property name="BasePermissions" type="System.UInt32" />
126 <property name="EveryonePermissions" type="System.UInt32" /> 126 <property name="EveryonePermissions" type="System.UInt32" />
@@ -132,4 +132,4 @@
132 <property name="Flags" type="System.UInt32" /> 132 <property name="Flags" type="System.UInt32" />
133 <property name="InvType" type="System.Int32" /> 133 <property name="InvType" type="System.Int32" />
134 </class> 134 </class>
135</hibernate-mapping> \ No newline at end of file 135</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
index 718cb98..0beddaf 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
@@ -1,16 +1,16 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false"> 3 <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false">
4 <id name="ProfileID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ProfileID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="AgentIP" type="String" length="24" /> 7 <property name="AgentIP" type="String" length="24" />
8 <property name="AgentPort" type="Int32" /> 8 <property name="AgentPort" type="Int32" />
9 <property name="AgentOnline" type="boolean" /> 9 <property name="AgentOnline" type="boolean" />
10 <property name="SessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="SessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="SecureSessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="SecureSessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="InitialRegion" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 12 <property name="InitialRegion" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
13 <property name="Region" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 13 <property name="Region" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
14 <property name="LoginTime" type="Int32" /> 14 <property name="LoginTime" type="Int32" />
15 <property name="LogoutTime" type="Int32" /> 15 <property name="LogoutTime" type="Int32" />
16 <property name="Handle" type="Int64" /> 16 <property name="Handle" type="Int64" />
@@ -18,4 +18,4 @@
18 <property name="PositionY" type="Single" /> 18 <property name="PositionY" type="Single" />
19 <property name="PositionZ" type="Single" /> 19 <property name="PositionZ" type="Single" />
20 </class> 20 </class>
21</hibernate-mapping> \ No newline at end of file 21</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
index 06e9c1a..b633c34 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
@@ -1,37 +1,37 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false"> 3 <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false">
4 <id name="Owner" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="Owner" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="BodyItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 7 <property name="BodyItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
8 <property name="BodyAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 8 <property name="BodyAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
9 <property name="SkinItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 9 <property name="SkinItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
10 <property name="SkinAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="SkinAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="HairItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="HairItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="HairAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 12 <property name="HairAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
13 <property name="EyesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 13 <property name="EyesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
14 <property name="EyesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 14 <property name="EyesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
15 <property name="ShirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 15 <property name="ShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
16 <property name="ShirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 16 <property name="ShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
17 <property name="PantsItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 17 <property name="PantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
18 <property name="PantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 18 <property name="PantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
19 <property name="ShoesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 19 <property name="ShoesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
20 <property name="ShoesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 20 <property name="ShoesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
21 <property name="SocksItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 21 <property name="SocksItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
22 <property name="SocksAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 22 <property name="SocksAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
23 <property name="JacketItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 23 <property name="JacketItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
24 <property name="JacketAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 24 <property name="JacketAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
25 <property name="GlovesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 25 <property name="GlovesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
26 <property name="GlovesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 26 <property name="GlovesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
27 <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 27 <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
28 <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 28 <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
29 <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 29 <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
30 <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 30 <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
31 <property name="SkirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 31 <property name="SkirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
32 <property name="SkirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 32 <property name="SkirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
33 <property name="Texture" type="OpenSim.Data.NHibernate.TextureUserType, OpenSim.Data.NHibernate" /> 33 <property name="Texture" type="OpenSim.Data.NHibernate.TextureUserType, OpenSim.Data.NHibernate" />
34 <property name="VisualParams" type="binary" /> 34 <property name="VisualParams" type="binary" />
35 <property name="Serial" type="Int32" /> 35 <property name="Serial" type="Int32" />
36 </class> 36 </class>
37</hibernate-mapping> \ No newline at end of file 37</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
index 4003628..873930b 100644
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
@@ -1,14 +1,14 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> 2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false"> 3 <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false">
4 <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="FirstName" index="user_firstname" type="String" length="32" /> 7 <property name="FirstName" index="user_firstname" type="String" length="32" />
8 <property name="SurName" index="user_surname" type="String" length="32" /> 8 <property name="SurName" index="user_surname" type="String" length="32" />
9 <property name="PasswordHash" type="String" length="32" /> 9 <property name="PasswordHash" type="String" length="32" />
10 <property name="PasswordSalt" type="String" length="32" /> 10 <property name="PasswordSalt" type="String" length="32" />
11 <property name="WebLoginKey" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="WebLoginKey" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="HomeRegionX" type="System.UInt32" /> 12 <property name="HomeRegionX" type="System.UInt32" />
13 <property name="HomeRegionY" type="System.UInt32" /> 13 <property name="HomeRegionY" type="System.UInt32" />
14 <property name="HomeLocationX" type="Single" /> 14 <property name="HomeLocationX" type="Single" />
@@ -19,12 +19,12 @@
19 <property name="HomeLookAtZ" type="Single" /> 19 <property name="HomeLookAtZ" type="Single" />
20 <property name="Created" type="Int32" /> 20 <property name="Created" type="Int32" />
21 <property name="LastLogin" type="Int32" /> 21 <property name="LastLogin" type="Int32" />
22 <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 22 <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
23 <property name="UserInventoryURI" type="String" length="255"/> 23 <property name="UserInventoryURI" type="String" length="255"/>
24 <property name="UserAssetURI" type="String" length="255"/> 24 <property name="UserAssetURI" type="String" length="255"/>
25 <property name="Image" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 25 <property name="Image" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
26 <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 26 <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
27 <property name="AboutText" type="String" length="255" /> 27 <property name="AboutText" type="String" length="255" />
28 <property name="FirstLifeAboutText" type="String" length="255" /> 28 <property name="FirstLifeAboutText" type="String" length="255" />
29 </class> 29 </class>
30</hibernate-mapping> \ No newline at end of file 30</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 608f03e..dd0da44 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -30,7 +30,7 @@ using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using log4net; 32using log4net;
33using libsecondlife; 33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
@@ -39,9 +39,9 @@ namespace OpenSim.Data.NHibernate
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 40
41 private double[,] map; 41 private double[,] map;
42 private LLUUID regionID; 42 private UUID regionID;
43 43
44 public Terrain(LLUUID Region, double[,] array) 44 public Terrain(UUID Region, double[,] array)
45 { 45 {
46 map = array; 46 map = array;
47 regionID = Region; 47 regionID = Region;
@@ -51,10 +51,10 @@ namespace OpenSim.Data.NHibernate
51 { 51 {
52 map = new double[Constants.RegionSize, Constants.RegionSize]; 52 map = new double[Constants.RegionSize, Constants.RegionSize];
53 map.Initialize(); 53 map.Initialize();
54 regionID = LLUUID.Zero; 54 regionID = UUID.Zero;
55 } 55 }
56 56
57 public LLUUID RegionID 57 public UUID RegionID
58 { 58 {
59 get { return regionID; } 59 get { return regionID; }
60 set { regionID = value; } 60 set { regionID = value; }
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index f8aa704..ff949d4 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using NHibernate; 32using NHibernate;
33using NHibernate.SqlTypes; 33using NHibernate.SqlTypes;
@@ -53,12 +53,12 @@ namespace OpenSim.Data.NHibernate
53 if (texture == null) 53 if (texture == null)
54 { 54 {
55 // TODO: should parametrize this texture out 55 // TODO: should parametrize this texture out
56 return new LLObject.TextureEntry(new LLUUID(Constants.DefaultTexture)); 56 return new Primitive.TextureEntry(new UUID(Constants.DefaultTexture));
57 } 57 }
58 else 58 else
59 { 59 {
60 byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes(); 60 byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes();
61 return new LLObject.TextureEntry(bytes, 0, bytes.Length); 61 return new Primitive.TextureEntry(bytes, 0, bytes.Length);
62 } 62 }
63 } 63 }
64 64
@@ -85,7 +85,7 @@ namespace OpenSim.Data.NHibernate
85 if (!rs.IsDBNull(ord)) 85 if (!rs.IsDBNull(ord))
86 { 86 {
87 byte[] bytes = (byte[])rs[ord]; 87 byte[] bytes = (byte[])rs[ord];
88 texture = new LLObject.TextureEntry(bytes, 0, bytes.Length); 88 texture = new Primitive.TextureEntry(bytes, 0, bytes.Length);
89 } 89 }
90 90
91 return texture; 91 return texture;
@@ -93,7 +93,7 @@ namespace OpenSim.Data.NHibernate
93 93
94 public void NullSafeSet(IDbCommand cmd, object obj, int index) 94 public void NullSafeSet(IDbCommand cmd, object obj, int index)
95 { 95 {
96 LLObject.TextureEntry texture = (LLObject.TextureEntry)obj; 96 Primitive.TextureEntry texture = (Primitive.TextureEntry)obj;
97 ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes(); 97 ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes();
98 } 98 }
99 99
@@ -104,7 +104,7 @@ namespace OpenSim.Data.NHibernate
104 104
105 public Type ReturnedType 105 public Type ReturnedType
106 { 106 {
107 get { return typeof(LLObject.TextureEntry); } 107 get { return typeof(Primitive.TextureEntry); }
108 } 108 }
109 109
110 public SqlType[] SqlTypes 110 public SqlType[] SqlTypes
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index 76369bd..aea03d6 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Environment.Scenes;
@@ -47,39 +47,39 @@ namespace OpenSim.Data.Null
47 { 47 {
48 } 48 }
49 49
50 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 50 public RegionSettings LoadRegionSettings(UUID regionUUID)
51 { 51 {
52 return null; 52 return null;
53 } 53 }
54 54
55 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 55 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
56 { 56 {
57 } 57 }
58 58
59 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 59 public void RemoveObject(UUID obj, UUID regionUUID)
60 { 60 {
61 } 61 }
62 62
63 // see IRegionDatastore 63 // see IRegionDatastore
64 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 64 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
65 { 65 {
66 } 66 }
67 67
68 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 68 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
69 { 69 {
70 return new List<SceneObjectGroup>(); 70 return new List<SceneObjectGroup>();
71 } 71 }
72 72
73 public void StoreTerrain(double[,] ter, LLUUID regionID) 73 public void StoreTerrain(double[,] ter, UUID regionID)
74 { 74 {
75 } 75 }
76 76
77 public double[,] LoadTerrain(LLUUID regionID) 77 public double[,] LoadTerrain(UUID regionID)
78 { 78 {
79 return null; 79 return null;
80 } 80 }
81 81
82 public void RemoveLandObject(LLUUID globalID) 82 public void RemoveLandObject(UUID globalID)
83 { 83 {
84 } 84 }
85 85
@@ -87,7 +87,7 @@ namespace OpenSim.Data.Null
87 { 87 {
88 } 88 }
89 89
90 public List<LandData> LoadLandObjects(LLUUID regionUUID) 90 public List<LandData> LoadLandObjects(UUID regionUUID)
91 { 91 {
92 return new List<LandData>(); 92 return new List<LandData>();
93 } 93 }
diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs
index cb613c1..f584855 100644
--- a/OpenSim/Data/OpenSimDataReader.cs
+++ b/OpenSim/Data/OpenSimDataReader.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Data; 28using System.Data;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Data.Base; 30using OpenSim.Data.Base;
31 31
32namespace OpenSim.Data 32namespace OpenSim.Data
@@ -37,25 +37,25 @@ namespace OpenSim.Data
37 { 37 {
38 } 38 }
39 39
40 public LLVector3 GetVector(string s) 40 public Vector3 GetVector(string s)
41 { 41 {
42 float x = GetFloat(s + "X"); 42 float x = GetFloat(s + "X");
43 float y = GetFloat(s + "Y"); 43 float y = GetFloat(s + "Y");
44 float z = GetFloat(s + "Z"); 44 float z = GetFloat(s + "Z");
45 45
46 LLVector3 vector = new LLVector3(x, y, z); 46 Vector3 vector = new Vector3(x, y, z);
47 47
48 return vector; 48 return vector;
49 } 49 }
50 50
51 public LLQuaternion GetQuaternion(string s) 51 public Quaternion GetQuaternion(string s)
52 { 52 {
53 float x = GetFloat(s + "X"); 53 float x = GetFloat(s + "X");
54 float y = GetFloat(s + "Y"); 54 float y = GetFloat(s + "Y");
55 float z = GetFloat(s + "Z"); 55 float z = GetFloat(s + "Z");
56 float w = GetFloat(s + "W"); 56 float w = GetFloat(s + "W");
57 57
58 LLQuaternion quaternion = new LLQuaternion(x, y, z, w); 58 Quaternion quaternion = new Quaternion(x, y, z, w);
59 59
60 return quaternion; 60 return quaternion;
61 } 61 }
diff --git a/OpenSim/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs
index ee54f4f..68a4ee4 100644
--- a/OpenSim/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Data/OpenSimDatabaseConnector.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System.Data; 28using System.Data;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Data.Base; 30using OpenSim.Data.Base;
31 31
32namespace OpenSim.Data 32namespace OpenSim.Data
@@ -39,9 +39,9 @@ namespace OpenSim.Data
39 39
40 public override object ConvertToDbType(object value) 40 public override object ConvertToDbType(object value)
41 { 41 {
42 if (value is LLUUID) 42 if (value is UUID)
43 { 43 {
44 return ((LLUUID) value).UUID.ToString(); 44 return ((UUID)value).ToString();
45 } 45 }
46 46
47 return base.ConvertToDbType(value); 47 return base.ConvertToDbType(value);
diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
index ff375fb..a342494 100644
--- a/OpenSim/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data.Common; 30using System.Data.Common;
31using libsecondlife; 31using OpenMetaverse;
32using OpenSim.Data.Base; 32using OpenSim.Data.Base;
33 33
34namespace OpenSim.Data 34namespace OpenSim.Data
@@ -47,17 +47,17 @@ namespace OpenSim.Data
47 string fieldName = FieldName; 47 string fieldName = FieldName;
48 object value = GetParamValue(obj); 48 object value = GetParamValue(obj);
49 49
50 if (ValueType == typeof(LLVector3)) 50 if (ValueType == typeof(Vector3))
51 { 51 {
52 LLVector3 vector = (LLVector3)value; 52 Vector3 vector = (Vector3)value;
53 53
54 RawAddParam(command, fieldNames, fieldName + "X", vector.X); 54 RawAddParam(command, fieldNames, fieldName + "X", vector.X);
55 RawAddParam(command, fieldNames, fieldName + "Y", vector.Y); 55 RawAddParam(command, fieldNames, fieldName + "Y", vector.Y);
56 RawAddParam(command, fieldNames, fieldName + "Z", vector.Z); 56 RawAddParam(command, fieldNames, fieldName + "Z", vector.Z);
57 } 57 }
58 else if (ValueType == typeof(LLQuaternion)) 58 else if (ValueType == typeof(Quaternion))
59 { 59 {
60 LLQuaternion quaternion = (LLQuaternion)value; 60 Quaternion quaternion = (Quaternion)value;
61 61
62 RawAddParam(command, fieldNames, fieldName + "X", quaternion.X); 62 RawAddParam(command, fieldNames, fieldName + "X", quaternion.X);
63 RawAddParam(command, fieldNames, fieldName + "Y", quaternion.Y); 63 RawAddParam(command, fieldNames, fieldName + "Y", quaternion.Y);
@@ -76,18 +76,18 @@ namespace OpenSim.Data
76 76
77 OpenSimDataReader osreader = (OpenSimDataReader) reader; 77 OpenSimDataReader osreader = (OpenSimDataReader) reader;
78 78
79 if (ValueType == typeof(LLVector3)) 79 if (ValueType == typeof(Vector3))
80 { 80 {
81 value = osreader.GetVector(FieldName); 81 value = osreader.GetVector(FieldName);
82 } 82 }
83 else if (ValueType == typeof(LLQuaternion)) 83 else if (ValueType == typeof(Quaternion))
84 { 84 {
85 value = osreader.GetQuaternion(FieldName); 85 value = osreader.GetQuaternion(FieldName);
86 } 86 }
87 else if (ValueType == typeof(LLUUID)) 87 else if (ValueType == typeof(UUID))
88 { 88 {
89 Guid guid = reader.GetGuid(FieldName); 89 Guid guid = reader.GetGuid(FieldName);
90 value = new LLUUID(guid); 90 value = new UUID(guid);
91 } 91 }
92 else 92 else
93 { 93 {
diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
index a4e39a1..5a6b3db 100644
--- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30using OpenSim.Data.Base; 30using OpenSim.Data.Base;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
@@ -89,9 +89,9 @@ namespace OpenSim.Data
89 delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileEnd; }, 89 delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileEnd; },
90 delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileEnd = value; }); 90 delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileEnd = value; });
91 91
92 rowMapperSchema.AddMapping<LLVector3>("Scale", 92 rowMapperSchema.AddMapping<Vector3>("Scale",
93 delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.Scale; }, 93 delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.Scale; },
94 delegate(PrimitiveBaseShapeRowMapper shape, LLVector3 value) { shape.Object.Scale = value; }); 94 delegate(PrimitiveBaseShapeRowMapper shape, Vector3 value) { shape.Object.Scale = value; });
95 95
96 rowMapperSchema.AddMapping<sbyte>("PathTaperX", 96 rowMapperSchema.AddMapping<sbyte>("PathTaperX",
97 delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperX; }, 97 delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperX; },
@@ -143,7 +143,7 @@ namespace OpenSim.Data
143 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 143 PrimitiveBaseShape shape = new PrimitiveBaseShape();
144 144
145 PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape); 145 PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape);
146 mapper.FillObject(reader); 146 mapper.FiPrimitive(reader);
147 147
148 return mapper; 148 return mapper;
149 } 149 }
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 9549b80..b4c7b3c 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -27,9 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using libsecondlife; 30using OpenMetaverse;
31using Nwc.XmlRpc; 31using Nwc.XmlRpc;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenMetaverse;
33 34
34namespace OpenSim.Data 35namespace OpenSim.Data
35{ 36{
@@ -51,7 +52,7 @@ namespace OpenSim.Data
51 /// <summary> 52 /// <summary>
52 /// OGS/OpenSim Specific ID for a region 53 /// OGS/OpenSim Specific ID for a region
53 /// </summary> 54 /// </summary>
54 public LLUUID UUID; 55 public UUID UUID;
55 56
56 /// <summary> 57 /// <summary>
57 /// Coordinates of the region 58 /// Coordinates of the region
@@ -117,18 +118,18 @@ namespace OpenSim.Data
117 /// <summary> 118 /// <summary>
118 /// Region Map Texture Asset 119 /// Region Map Texture Asset
119 /// </summary> 120 /// </summary>
120 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-1111-9999-000000000006"); 121 public UUID regionMapTextureID = new UUID("00000000-0000-1111-9999-000000000006");
121 122
122 /// <summary> 123 /// <summary>
123 /// this particular mod to the file provides support within the spec for RegionProfileData for the 124 /// this particular mod to the file provides support within the spec for RegionProfileData for the
124 /// owner_uuid for the region 125 /// owner_uuid for the region
125 /// </summary> 126 /// </summary>
126 public LLUUID owner_uuid = LLUUID.Zero; 127 public UUID owner_uuid = UUID.Zero;
127 128
128 /// <summary> 129 /// <summary>
129 /// OGS/OpenSim Specific original ID for a region after move/split 130 /// OGS/OpenSim Specific original ID for a region after move/split
130 /// </summary> 131 /// </summary>
131 public LLUUID originUUID; 132 public UUID originUUID;
132 133
133 /// <summary> 134 /// <summary>
134 /// Request sim data based on arbitrary key/value 135 /// Request sim data based on arbitrary key/value
@@ -161,7 +162,7 @@ namespace OpenSim.Data
161 simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 162 simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
162 simData.serverURI = (string) responseData["server_uri"]; 163 simData.serverURI = (string) responseData["server_uri"];
163 simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; 164 simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/";
164 simData.UUID = new LLUUID((string) responseData["region_UUID"]); 165 simData.UUID = new UUID((string) responseData["region_UUID"]);
165 simData.regionName = (string) responseData["region_name"]; 166 simData.regionName = (string) responseData["region_name"];
166 } 167 }
167 168
@@ -177,10 +178,10 @@ namespace OpenSim.Data
177 /// <param name="gridserver_recvkey"></param> 178 /// <param name="gridserver_recvkey"></param>
178 /// <returns>The sim profile. Null if there was a request failure</returns> 179 /// <returns>The sim profile. Null if there was a request failure</returns>
179 /// <remarks>This method should be statics</remarks> 180 /// <remarks>This method should be statics</remarks>
180 public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url, 181 public static RegionProfileData RequestSimProfileData(UUID region_uuid, Uri gridserver_url,
181 string gridserver_sendkey, string gridserver_recvkey) 182 string gridserver_sendkey, string gridserver_recvkey)
182 { 183 {
183 return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.UUID.ToString()); 184 return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.Guid.ToString());
184 } 185 }
185 186
186 /// <summary> 187 /// <summary>
diff --git a/OpenSim/Data/ReservationData.cs b/OpenSim/Data/ReservationData.cs
index 43fb299..dac1b7b 100644
--- a/OpenSim/Data/ReservationData.cs
+++ b/OpenSim/Data/ReservationData.cs
@@ -26,13 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Data 31namespace OpenSim.Data
32{ 32{
33 public class ReservationData 33 public class ReservationData
34 { 34 {
35 public LLUUID userUUID = LLUUID.Zero; 35 public UUID userUUID = UUID.Zero;
36 public int reservationMinX = 0; 36 public int reservationMinX = 0;
37 public int reservationMinY = 0; 37 public int reservationMinY = 0;
38 public int reservationMaxX = 65536; 38 public int reservationMaxX = 65536;
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 220cebf..8b14f09 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenSim.Framework; 34using OpenSim.Framework;
@@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLite
87 /// </summary> 87 /// </summary>
88 /// <param name="uuid">UUID of ... ?</param> 88 /// <param name="uuid">UUID of ... ?</param>
89 /// <returns>Asset base</returns> 89 /// <returns>Asset base</returns>
90 override public AssetBase FetchAsset(LLUUID uuid) 90 override public AssetBase FetchAsset(UUID uuid)
91 { 91 {
92 lock (this) 92 lock (this)
93 { 93 {
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
190 /// </summary> 190 /// </summary>
191 /// <param name="uuid">The asset UUID</param> 191 /// <param name="uuid">The asset UUID</param>
192 /// <returns>True if exist, or false.</returns> 192 /// <returns>True if exist, or false.</returns>
193 override public bool ExistsAsset(LLUUID uuid) 193 override public bool ExistsAsset(UUID uuid)
194 { 194 {
195 lock (this) { 195 lock (this) {
196 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) 196 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
@@ -217,7 +217,7 @@ namespace OpenSim.Data.SQLite
217 /// Delete an asset from database 217 /// Delete an asset from database
218 /// </summary> 218 /// </summary>
219 /// <param name="uuid"></param> 219 /// <param name="uuid"></param>
220 public void DeleteAsset(LLUUID uuid) 220 public void DeleteAsset(UUID uuid)
221 { 221 {
222 using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) 222 using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
223 { 223 {
@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite
239 // back out. Not enough time to figure it out yet. 239 // back out. Not enough time to figure it out yet.
240 AssetBase asset = new AssetBase(); 240 AssetBase asset = new AssetBase();
241 241
242 asset.FullID = new LLUUID((String) row["UUID"]); 242 asset.FullID = new UUID((String) row["UUID"]);
243 asset.Name = (String) row["Name"]; 243 asset.Name = (String) row["Name"];
244 asset.Description = (String) row["Description"]; 244 asset.Description = (String) row["Description"];
245 asset.Type = Convert.ToSByte(row["Type"]); 245 asset.Type = Convert.ToSByte(row["Type"]);
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index ffe7644..1245caa 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -83,7 +83,7 @@ namespace OpenSim.Data.SQLite
83 get { return new List<string>(m_FieldMap.Keys).ToArray(); } 83 get { return new List<string>(m_FieldMap.Keys).ToArray(); }
84 } 84 }
85 85
86 public EstateSettings LoadEstateSettings(LLUUID regionID) 86 public EstateSettings LoadEstateSettings(UUID regionID)
87 { 87 {
88 EstateSettings es = new EstateSettings(); 88 EstateSettings es = new EstateSettings();
89 es.OnSave += StoreEstateSettings; 89 es.OnSave += StoreEstateSettings;
@@ -109,11 +109,11 @@ namespace OpenSim.Data.SQLite
109 else 109 else
110 m_FieldMap[name].SetValue(es, false); 110 m_FieldMap[name].SetValue(es, false);
111 } 111 }
112 else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) 112 else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
113 { 113 {
114 LLUUID uuid = LLUUID.Zero; 114 UUID uuid = UUID.Zero;
115 115
116 LLUUID.TryParse(r[name].ToString(), out uuid); 116 UUID.TryParse(r[name].ToString(), out uuid);
117 m_FieldMap[name].SetValue(es, uuid); 117 m_FieldMap[name].SetValue(es, uuid);
118 } 118 }
119 else 119 else
@@ -258,8 +258,8 @@ namespace OpenSim.Data.SQLite
258 { 258 {
259 EstateBan eb = new EstateBan(); 259 EstateBan eb = new EstateBan();
260 260
261 LLUUID uuid = new LLUUID(); 261 UUID uuid = new UUID();
262 LLUUID.TryParse(r["bannedUUID"].ToString(), out uuid); 262 UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
263 263
264 eb.bannedUUID = uuid; 264 eb.bannedUUID = uuid;
265 eb.bannedIP = "0.0.0.0"; 265 eb.bannedIP = "0.0.0.0";
@@ -292,7 +292,7 @@ namespace OpenSim.Data.SQLite
292 } 292 }
293 } 293 }
294 294
295 void SaveUUIDList(uint EstateID, string table, LLUUID[] data) 295 void SaveUUIDList(uint EstateID, string table, UUID[] data)
296 { 296 {
297 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 297 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
298 298
@@ -305,7 +305,7 @@ namespace OpenSim.Data.SQLite
305 305
306 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )"; 306 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
307 307
308 foreach (LLUUID uuid in data) 308 foreach (UUID uuid in data)
309 { 309 {
310 cmd.Parameters.Add(":EstateID", EstateID.ToString()); 310 cmd.Parameters.Add(":EstateID", EstateID.ToString());
311 cmd.Parameters.Add(":uuid", uuid.ToString()); 311 cmd.Parameters.Add(":uuid", uuid.ToString());
@@ -315,9 +315,9 @@ namespace OpenSim.Data.SQLite
315 } 315 }
316 } 316 }
317 317
318 LLUUID[] LoadUUIDList(uint EstateID, string table) 318 UUID[] LoadUUIDList(uint EstateID, string table)
319 { 319 {
320 List<LLUUID> uuids = new List<LLUUID>(); 320 List<UUID> uuids = new List<UUID>();
321 321
322 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 322 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
323 323
@@ -330,8 +330,8 @@ namespace OpenSim.Data.SQLite
330 { 330 {
331 // EstateBan eb = new EstateBan(); 331 // EstateBan eb = new EstateBan();
332 332
333 LLUUID uuid = new LLUUID(); 333 UUID uuid = new UUID();
334 LLUUID.TryParse(r["uuid"].ToString(), out uuid); 334 UUID.TryParse(r["uuid"].ToString(), out uuid);
335 335
336 uuids.Add(uuid); 336 uuids.Add(uuid);
337 } 337 }
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();
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 4c35ac2..ca7e612 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -109,13 +109,13 @@ namespace OpenSim.Data.SQLite
109 public InventoryItemBase buildItem(DataRow row) 109 public InventoryItemBase buildItem(DataRow row)
110 { 110 {
111 InventoryItemBase item = new InventoryItemBase(); 111 InventoryItemBase item = new InventoryItemBase();
112 item.ID = new LLUUID((string) row["UUID"]); 112 item.ID = new UUID((string) row["UUID"]);
113 item.AssetID = new LLUUID((string) row["assetID"]); 113 item.AssetID = new UUID((string) row["assetID"]);
114 item.AssetType = Convert.ToInt32(row["assetType"]); 114 item.AssetType = Convert.ToInt32(row["assetType"]);
115 item.InvType = Convert.ToInt32(row["invType"]); 115 item.InvType = Convert.ToInt32(row["invType"]);
116 item.Folder = new LLUUID((string) row["parentFolderID"]); 116 item.Folder = new UUID((string) row["parentFolderID"]);
117 item.Owner = new LLUUID((string) row["avatarID"]); 117 item.Owner = new UUID((string) row["avatarID"]);
118 item.Creator = new LLUUID((string) row["creatorsID"]); 118 item.Creator = new UUID((string) row["creatorsID"]);
119 item.Name = (string) row["inventoryName"]; 119 item.Name = (string) row["inventoryName"];
120 item.Description = (string) row["inventoryDescription"]; 120 item.Description = (string) row["inventoryDescription"];
121 121
@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
135 item.CreationDate = Convert.ToInt32(row["creationDate"]); 135 item.CreationDate = Convert.ToInt32(row["creationDate"]);
136 136
137 if (!Convert.IsDBNull(row["groupID"])) 137 if (!Convert.IsDBNull(row["groupID"]))
138 item.GroupID = new LLUUID((string)row["groupID"]); 138 item.GroupID = new UUID((string)row["groupID"]);
139 139
140 if (!Convert.IsDBNull(row["groupOwned"])) 140 if (!Convert.IsDBNull(row["groupOwned"]))
141 item.GroupOwned = Convert.ToBoolean(row["groupOwned"]); 141 item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
@@ -317,7 +317,7 @@ namespace OpenSim.Data.SQLite
317 /// </summary> 317 /// </summary>
318 /// <param name="folderID">The UUID of the target folder</param> 318 /// <param name="folderID">The UUID of the target folder</param>
319 /// <returns>A List of InventoryItemBase items</returns> 319 /// <returns>A List of InventoryItemBase items</returns>
320 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 320 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
321 { 321 {
322 lock (ds) 322 lock (ds)
323 { 323 {
@@ -339,20 +339,20 @@ namespace OpenSim.Data.SQLite
339 /// </summary> 339 /// </summary>
340 /// <param name="user">The user whos inventory is to be searched</param> 340 /// <param name="user">The user whos inventory is to be searched</param>
341 /// <returns>A list of folder objects</returns> 341 /// <returns>A list of folder objects</returns>
342 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 342 public List<InventoryFolderBase> getUserRootFolders(UUID user)
343 { 343 {
344 return new List<InventoryFolderBase>(); 344 return new List<InventoryFolderBase>();
345 } 345 }
346 346
347 // see InventoryItemBase.getUserRootFolder 347 // see InventoryItemBase.getUserRootFolder
348 public InventoryFolderBase getUserRootFolder(LLUUID user) 348 public InventoryFolderBase getUserRootFolder(UUID user)
349 { 349 {
350 lock (ds) 350 lock (ds)
351 { 351 {
352 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 352 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
353 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"]; 353 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
354 string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" + 354 string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" +
355 Util.ToRawUuidString(LLUUID.Zero) + "'"; 355 Util.ToRawUuidString(UUID.Zero) + "'";
356 DataRow[] rows = inventoryFolderTable.Select(selectExp); 356 DataRow[] rows = inventoryFolderTable.Select(selectExp);
357 foreach (DataRow row in rows) 357 foreach (DataRow row in rows)
358 { 358 {
@@ -378,7 +378,7 @@ namespace OpenSim.Data.SQLite
378 /// </summary> 378 /// </summary>
379 /// <param name="folders">list where folders will be appended</param> 379 /// <param name="folders">list where folders will be appended</param>
380 /// <param name="parentID">ID of parent</param> 380 /// <param name="parentID">ID of parent</param>
381 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 381 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
382 { 382 {
383 lock (ds) 383 lock (ds)
384 { 384 {
@@ -398,7 +398,7 @@ namespace OpenSim.Data.SQLite
398 /// </summary> 398 /// </summary>
399 /// <param name="parentID">The folder to get subfolders for</param> 399 /// <param name="parentID">The folder to get subfolders for</param>
400 /// <returns>A list of inventory folders</returns> 400 /// <returns>A list of inventory folders</returns>
401 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 401 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
402 { 402 {
403 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 403 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
404 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); 404 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID));
@@ -410,7 +410,7 @@ namespace OpenSim.Data.SQLite
410 /// </summary> 410 /// </summary>
411 /// <param name="parentID"></param> 411 /// <param name="parentID"></param>
412 /// <returns></returns> 412 /// <returns></returns>
413 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 413 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
414 { 414 {
415 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one 415 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
416 * - We will only need to hit the database twice instead of n times. 416 * - We will only need to hit the database twice instead of n times.
@@ -441,7 +441,7 @@ namespace OpenSim.Data.SQLite
441 if (parentRow.GetLength(0) >= 1) // No result means parent folder does not exist 441 if (parentRow.GetLength(0) >= 1) // No result means parent folder does not exist
442 { 442 {
443 parentFolder = buildFolder(parentRow[0]); 443 parentFolder = buildFolder(parentRow[0]);
444 LLUUID agentID = parentFolder.Owner; 444 UUID agentID = parentFolder.Owner;
445 selectExp = "agentID = '" + Util.ToRawUuidString(agentID) + "'"; 445 selectExp = "agentID = '" + Util.ToRawUuidString(agentID) + "'";
446 folderRows = inventoryFolderTable.Select(selectExp); 446 folderRows = inventoryFolderTable.Select(selectExp);
447 } 447 }
@@ -451,7 +451,7 @@ namespace OpenSim.Data.SQLite
451 /* if we're querying the root folder, just return an unordered list of all folders in the user's 451 /* if we're querying the root folder, just return an unordered list of all folders in the user's
452 * inventory 452 * inventory
453 */ 453 */
454 if (parentFolder.ParentID == LLUUID.Zero) 454 if (parentFolder.ParentID == UUID.Zero)
455 { 455 {
456 foreach (DataRow row in folderRows) 456 foreach (DataRow row in folderRows)
457 { 457 {
@@ -470,13 +470,13 @@ namespace OpenSim.Data.SQLite
470 { // Querying a non-root folder 470 { // Querying a non-root folder
471 471
472 // Build a hash table of all user's inventory folders, indexed by each folder's parent ID 472 // Build a hash table of all user's inventory folders, indexed by each folder's parent ID
473 Dictionary<LLUUID, List<InventoryFolderBase>> hashtable = 473 Dictionary<UUID, List<InventoryFolderBase>> hashtable =
474 new Dictionary<LLUUID, List<InventoryFolderBase>>(folderRows.GetLength(0)); 474 new Dictionary<UUID, List<InventoryFolderBase>>(folderRows.GetLength(0));
475 475
476 foreach (DataRow row in folderRows) 476 foreach (DataRow row in folderRows)
477 { 477 {
478 InventoryFolderBase curFolder = buildFolder(row); 478 InventoryFolderBase curFolder = buildFolder(row);
479 if (curFolder.ParentID != LLUUID.Zero) // Discard root of tree - not needed 479 if (curFolder.ParentID != UUID.Zero) // Discard root of tree - not needed
480 { 480 {
481 if (hashtable.ContainsKey(curFolder.ParentID)) 481 if (hashtable.ContainsKey(curFolder.ParentID))
482 { 482 {
@@ -514,7 +514,7 @@ namespace OpenSim.Data.SQLite
514 /// </summary> 514 /// </summary>
515 /// <param name="item">The UUID of the item to be returned</param> 515 /// <param name="item">The UUID of the item to be returned</param>
516 /// <returns>A class containing item information</returns> 516 /// <returns>A class containing item information</returns>
517 public InventoryItemBase getInventoryItem(LLUUID item) 517 public InventoryItemBase getInventoryItem(UUID item)
518 { 518 {
519 lock (ds) 519 lock (ds)
520 { 520 {
@@ -535,7 +535,7 @@ namespace OpenSim.Data.SQLite
535 /// </summary> 535 /// </summary>
536 /// <param name="folder">The UUID of the folder to be returned</param> 536 /// <param name="folder">The UUID of the folder to be returned</param>
537 /// <returns>A class containing folder information</returns> 537 /// <returns>A class containing folder information</returns>
538 public InventoryFolderBase getInventoryFolder(LLUUID folder) 538 public InventoryFolderBase getInventoryFolder(UUID folder)
539 { 539 {
540 // TODO: Deep voodoo here. If you enable this code then 540 // TODO: Deep voodoo here. If you enable this code then
541 // multi region breaks. No idea why, but I figured it was 541 // multi region breaks. No idea why, but I figured it was
@@ -578,7 +578,7 @@ namespace OpenSim.Data.SQLite
578 /// Delete an inventory item 578 /// Delete an inventory item
579 /// </summary> 579 /// </summary>
580 /// <param name="item">The item UUID</param> 580 /// <param name="item">The item UUID</param>
581 public void deleteInventoryItem(LLUUID itemID) 581 public void deleteInventoryItem(UUID itemID)
582 { 582 {
583 lock (ds) 583 lock (ds)
584 { 584 {
@@ -599,7 +599,7 @@ namespace OpenSim.Data.SQLite
599 /// </summary> 599 /// </summary>
600 /// <param name="folderId">id of the folder, whose item content should be deleted</param> 600 /// <param name="folderId">id of the folder, whose item content should be deleted</param>
601 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo> 601 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo>
602 private void deleteItemsInFolder(LLUUID folderId) 602 private void deleteItemsInFolder(UUID folderId)
603 { 603 {
604 List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId)); 604 List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId));
605 605
@@ -641,7 +641,7 @@ namespace OpenSim.Data.SQLite
641 /// This will clean-up any child folders and child items as well 641 /// This will clean-up any child folders and child items as well
642 /// </remarks> 642 /// </remarks>
643 /// <param name="folderID">the folder UUID</param> 643 /// <param name="folderID">the folder UUID</param>
644 public void deleteInventoryFolder(LLUUID folderID) 644 public void deleteInventoryFolder(UUID folderID)
645 { 645 {
646 lock (ds) 646 lock (ds)
647 { 647 {
@@ -791,10 +791,10 @@ namespace OpenSim.Data.SQLite
791 private static InventoryFolderBase buildFolder(DataRow row) 791 private static InventoryFolderBase buildFolder(DataRow row)
792 { 792 {
793 InventoryFolderBase folder = new InventoryFolderBase(); 793 InventoryFolderBase folder = new InventoryFolderBase();
794 folder.ID = new LLUUID((string) row["UUID"]); 794 folder.ID = new UUID((string) row["UUID"]);
795 folder.Name = (string) row["name"]; 795 folder.Name = (string) row["name"];
796 folder.Owner = new LLUUID((string) row["agentID"]); 796 folder.Owner = new UUID((string) row["agentID"]);
797 folder.ParentID = new LLUUID((string) row["parentID"]); 797 folder.ParentID = new UUID((string) row["parentID"]);
798 folder.Type = Convert.ToInt16(row["type"]); 798 folder.Type = Convert.ToInt16(row["type"]);
799 folder.Version = Convert.ToUInt16(row["version"]); 799 folder.Version = Convert.ToUInt16(row["version"]);
800 return folder; 800 return folder;
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;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35 35
36namespace OpenSim.Data.SQLite 36namespace 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;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index dd88751..bb441f6 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using Mono.Data.SqliteClient; 36using Mono.Data.SqliteClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
190 { 190 {
191 } 191 }
192 192
193 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 193 public RegionSettings LoadRegionSettings(UUID regionUUID)
194 { 194 {
195 return null; 195 return null;
196 } 196 }
@@ -200,15 +200,15 @@ namespace OpenSim.Data.SQLite
200 /// </summary> 200 /// </summary>
201 /// <param name="obj">the object</param> 201 /// <param name="obj">the object</param>
202 /// <param name="regionUUID">the region UUID</param> 202 /// <param name="regionUUID">the region UUID</param>
203 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 203 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
204 { 204 {
205 lock (ds) 205 lock (ds)
206 { 206 {
207 foreach (SceneObjectPart prim in obj.Children.Values) 207 foreach (SceneObjectPart prim in obj.Children.Values)
208 { 208 {
209 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0 209 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
210 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 210 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
211 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) 211 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
212 { 212 {
213 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 213 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
214 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); 214 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
@@ -235,9 +235,9 @@ namespace OpenSim.Data.SQLite
235 /// </summary> 235 /// </summary>
236 /// <param name="obj">the object</param> 236 /// <param name="obj">the object</param>
237 /// <param name="regionUUID">the region UUID</param> 237 /// <param name="regionUUID">the region UUID</param>
238 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 238 public void RemoveObject(UUID obj, UUID regionUUID)
239 { 239 {
240 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 240 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
241 241
242 DataTable prims = ds.Tables["prims"]; 242 DataTable prims = ds.Tables["prims"];
243 DataTable shapes = ds.Tables["primshapes"]; 243 DataTable shapes = ds.Tables["primshapes"];
@@ -249,7 +249,7 @@ namespace OpenSim.Data.SQLite
249 foreach (DataRow row in primRows) 249 foreach (DataRow row in primRows)
250 { 250 {
251 // Remove shape rows 251 // Remove shape rows
252 LLUUID uuid = new LLUUID((string) row["UUID"]); 252 UUID uuid = new UUID((string) row["UUID"]);
253 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid)); 253 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
254 if (shapeRow != null) 254 if (shapeRow != null)
255 { 255 {
@@ -271,7 +271,7 @@ namespace OpenSim.Data.SQLite
271 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes. 271 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
272 /// </summary> 272 /// </summary>
273 /// <param name="uuid">The item UUID</param> 273 /// <param name="uuid">The item UUID</param>
274 private void RemoveItems(LLUUID uuid) 274 private void RemoveItems(UUID uuid)
275 { 275 {
276 DataTable items = ds.Tables["primitems"]; 276 DataTable items = ds.Tables["primitems"];
277 277
@@ -289,9 +289,9 @@ namespace OpenSim.Data.SQLite
289 /// </summary> 289 /// </summary>
290 /// <param name="regionUUID">The region UUID</param> 290 /// <param name="regionUUID">The region UUID</param>
291 /// <returns>List of loaded groups</returns> 291 /// <returns>List of loaded groups</returns>
292 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 292 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
293 { 293 {
294 Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); 294 Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
295 295
296 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); 296 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
297 297
@@ -350,7 +350,7 @@ namespace OpenSim.Data.SQLite
350 "[REGION DB]: No shape found for prim in storage, so setting default box shape"); 350 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
351 prim.Shape = PrimitiveBaseShape.Default; 351 prim.Shape = PrimitiveBaseShape.Default;
352 } 352 }
353 createdObjects[new LLUUID(objID)].AddPart(prim); 353 createdObjects[new UUID(objID)].AddPart(prim);
354 } 354 }
355 355
356 LoadItems(prim); 356 LoadItems(prim);
@@ -379,7 +379,7 @@ namespace OpenSim.Data.SQLite
379 379
380 DataTable dbItems = ds.Tables["primitems"]; 380 DataTable dbItems = ds.Tables["primitems"];
381 381
382 String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); 382 String sql = String.Format("primID = '{0}'", prim.ToString());
383 DataRow[] dbItemRows = dbItems.Select(sql); 383 DataRow[] dbItemRows = dbItems.Select(sql);
384 384
385 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); 385 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
@@ -407,7 +407,7 @@ namespace OpenSim.Data.SQLite
407 /// </summary> 407 /// </summary>
408 /// <param name="ter">terrain heightfield</param> 408 /// <param name="ter">terrain heightfield</param>
409 /// <param name="regionID">region UUID</param> 409 /// <param name="regionID">region UUID</param>
410 public void StoreTerrain(double[,] ter, LLUUID regionID) 410 public void StoreTerrain(double[,] ter, UUID regionID)
411 { 411 {
412 lock (ds) 412 lock (ds)
413 { 413 {
@@ -451,7 +451,7 @@ namespace OpenSim.Data.SQLite
451 /// </summary> 451 /// </summary>
452 /// <param name="regionID">the region UUID</param> 452 /// <param name="regionID">the region UUID</param>
453 /// <returns>Heightfield data</returns> 453 /// <returns>Heightfield data</returns>
454 public double[,] LoadTerrain(LLUUID regionID) 454 public double[,] LoadTerrain(UUID regionID)
455 { 455 {
456 lock (ds) 456 lock (ds)
457 { 457 {
@@ -499,7 +499,7 @@ namespace OpenSim.Data.SQLite
499 /// 499 ///
500 /// </summary> 500 /// </summary>
501 /// <param name="globalID"></param> 501 /// <param name="globalID"></param>
502 public void RemoveLandObject(LLUUID globalID) 502 public void RemoveLandObject(UUID globalID)
503 { 503 {
504 lock (ds) 504 lock (ds)
505 { 505 {
@@ -563,7 +563,7 @@ namespace OpenSim.Data.SQLite
563 /// </summary> 563 /// </summary>
564 /// <param name="regionUUID"></param> 564 /// <param name="regionUUID"></param>
565 /// <returns></returns> 565 /// <returns></returns>
566 public List<LandData> LoadLandObjects(LLUUID regionUUID) 566 public List<LandData> LoadLandObjects(UUID regionUUID)
567 { 567 {
568 List<LandData> landDataForRegion = new List<LandData>(); 568 List<LandData> landDataForRegion = new List<LandData>();
569 lock (ds) 569 lock (ds)
@@ -821,12 +821,12 @@ namespace OpenSim.Data.SQLite
821 createCol(land, "IsGroupOwned", typeof (Boolean)); 821 createCol(land, "IsGroupOwned", typeof (Boolean));
822 createCol(land, "Area", typeof (Int32)); 822 createCol(land, "Area", typeof (Int32));
823 createCol(land, "AuctionID", typeof (Int32)); //Unemplemented 823 createCol(land, "AuctionID", typeof (Int32)); //Unemplemented
824 createCol(land, "Category", typeof (Int32)); //Enum libsecondlife.Parcel.ParcelCategory 824 createCol(land, "Category", typeof (Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
825 createCol(land, "ClaimDate", typeof (Int32)); 825 createCol(land, "ClaimDate", typeof (Int32));
826 createCol(land, "ClaimPrice", typeof (Int32)); 826 createCol(land, "ClaimPrice", typeof (Int32));
827 createCol(land, "GroupUUID", typeof (string)); 827 createCol(land, "GroupUUID", typeof (string));
828 createCol(land, "SalePrice", typeof (Int32)); 828 createCol(land, "SalePrice", typeof (Int32));
829 createCol(land, "LandStatus", typeof (Int32)); //Enum. libsecondlife.Parcel.ParcelStatus 829 createCol(land, "LandStatus", typeof (Int32)); //Enum. OpenMetaverse.Parcel.ParcelStatus
830 createCol(land, "LandFlags", typeof (UInt32)); 830 createCol(land, "LandFlags", typeof (UInt32));
831 createCol(land, "LandingType", typeof (Byte)); 831 createCol(land, "LandingType", typeof (Byte));
832 createCol(land, "MediaAutoScale", typeof (Byte)); 832 createCol(land, "MediaAutoScale", typeof (Byte));
@@ -882,7 +882,7 @@ namespace OpenSim.Data.SQLite
882 // interesting has to be done to actually get these values 882 // interesting has to be done to actually get these values
883 // back out. Not enough time to figure it out yet. 883 // back out. Not enough time to figure it out yet.
884 SceneObjectPart prim = new SceneObjectPart(); 884 SceneObjectPart prim = new SceneObjectPart();
885 prim.UUID = new LLUUID((String) row["UUID"]); 885 prim.UUID = new UUID((String) row["UUID"]);
886 // explicit conversion of integers is required, which sort 886 // explicit conversion of integers is required, which sort
887 // of sucks. No idea if there is a shortcut here or not. 887 // of sucks. No idea if there is a shortcut here or not.
888 prim.ParentID = Convert.ToUInt32(row["ParentID"]); 888 prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -895,43 +895,43 @@ namespace OpenSim.Data.SQLite
895 prim.TouchName = (String) row["TouchName"]; 895 prim.TouchName = (String) row["TouchName"];
896 // permissions 896 // permissions
897 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 897 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
898 prim.CreatorID = new LLUUID((String) row["CreatorID"]); 898 prim.CreatorID = new UUID((String) row["CreatorID"]);
899 prim.OwnerID = new LLUUID((String) row["OwnerID"]); 899 prim.OwnerID = new UUID((String) row["OwnerID"]);
900 prim.GroupID = new LLUUID((String) row["GroupID"]); 900 prim.GroupID = new UUID((String) row["GroupID"]);
901 prim.LastOwnerID = new LLUUID((String) row["LastOwnerID"]); 901 prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
902 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); 902 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
903 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); 903 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
904 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); 904 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
905 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]); 905 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
906 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); 906 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
907 // vectors 907 // vectors
908 prim.OffsetPosition = new LLVector3( 908 prim.OffsetPosition = new Vector3(
909 Convert.ToSingle(row["PositionX"]), 909 Convert.ToSingle(row["PositionX"]),
910 Convert.ToSingle(row["PositionY"]), 910 Convert.ToSingle(row["PositionY"]),
911 Convert.ToSingle(row["PositionZ"]) 911 Convert.ToSingle(row["PositionZ"])
912 ); 912 );
913 prim.GroupPosition = new LLVector3( 913 prim.GroupPosition = new Vector3(
914 Convert.ToSingle(row["GroupPositionX"]), 914 Convert.ToSingle(row["GroupPositionX"]),
915 Convert.ToSingle(row["GroupPositionY"]), 915 Convert.ToSingle(row["GroupPositionY"]),
916 Convert.ToSingle(row["GroupPositionZ"]) 916 Convert.ToSingle(row["GroupPositionZ"])
917 ); 917 );
918 prim.Velocity = new LLVector3( 918 prim.Velocity = new Vector3(
919 Convert.ToSingle(row["VelocityX"]), 919 Convert.ToSingle(row["VelocityX"]),
920 Convert.ToSingle(row["VelocityY"]), 920 Convert.ToSingle(row["VelocityY"]),
921 Convert.ToSingle(row["VelocityZ"]) 921 Convert.ToSingle(row["VelocityZ"])
922 ); 922 );
923 prim.AngularVelocity = new LLVector3( 923 prim.AngularVelocity = new Vector3(
924 Convert.ToSingle(row["AngularVelocityX"]), 924 Convert.ToSingle(row["AngularVelocityX"]),
925 Convert.ToSingle(row["AngularVelocityY"]), 925 Convert.ToSingle(row["AngularVelocityY"]),
926 Convert.ToSingle(row["AngularVelocityZ"]) 926 Convert.ToSingle(row["AngularVelocityZ"])
927 ); 927 );
928 prim.Acceleration = new LLVector3( 928 prim.Acceleration = new Vector3(
929 Convert.ToSingle(row["AccelerationX"]), 929 Convert.ToSingle(row["AccelerationX"]),
930 Convert.ToSingle(row["AccelerationY"]), 930 Convert.ToSingle(row["AccelerationY"]),
931 Convert.ToSingle(row["AccelerationZ"]) 931 Convert.ToSingle(row["AccelerationZ"])
932 ); 932 );
933 // quaternions 933 // quaternions
934 prim.RotationOffset = new LLQuaternion( 934 prim.RotationOffset = new Quaternion(
935 Convert.ToSingle(row["RotationX"]), 935 Convert.ToSingle(row["RotationX"]),
936 Convert.ToSingle(row["RotationY"]), 936 Convert.ToSingle(row["RotationY"]),
937 Convert.ToSingle(row["RotationZ"]), 937 Convert.ToSingle(row["RotationZ"]),
@@ -940,11 +940,11 @@ namespace OpenSim.Data.SQLite
940 940
941 try 941 try
942 { 942 {
943 prim.SitTargetPositionLL = new LLVector3( 943 prim.SitTargetPositionLL = new Vector3(
944 Convert.ToSingle(row["SitTargetOffsetX"]), 944 Convert.ToSingle(row["SitTargetOffsetX"]),
945 Convert.ToSingle(row["SitTargetOffsetY"]), 945 Convert.ToSingle(row["SitTargetOffsetY"]),
946 Convert.ToSingle(row["SitTargetOffsetZ"])); 946 Convert.ToSingle(row["SitTargetOffsetZ"]));
947 prim.SitTargetOrientationLL = new LLQuaternion( 947 prim.SitTargetOrientationLL = new Quaternion(
948 Convert.ToSingle( 948 Convert.ToSingle(
949 row["SitTargetOrientX"]), 949 row["SitTargetOrientX"]),
950 Convert.ToSingle( 950 Convert.ToSingle(
@@ -993,10 +993,10 @@ namespace OpenSim.Data.SQLite
993 { 993 {
994 TaskInventoryItem taskItem = new TaskInventoryItem(); 994 TaskInventoryItem taskItem = new TaskInventoryItem();
995 995
996 taskItem.ItemID = new LLUUID((String)row["itemID"]); 996 taskItem.ItemID = new UUID((String)row["itemID"]);
997 taskItem.ParentPartID = new LLUUID((String)row["primID"]); 997 taskItem.ParentPartID = new UUID((String)row["primID"]);
998 taskItem.AssetID = new LLUUID((String)row["assetID"]); 998 taskItem.AssetID = new UUID((String)row["assetID"]);
999 taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); 999 taskItem.ParentID = new UUID((String)row["parentFolderID"]);
1000 1000
1001 taskItem.InvType = Convert.ToInt32(row["invType"]); 1001 taskItem.InvType = Convert.ToInt32(row["invType"]);
1002 taskItem.Type = Convert.ToInt32(row["assetType"]); 1002 taskItem.Type = Convert.ToInt32(row["assetType"]);
@@ -1004,10 +1004,10 @@ namespace OpenSim.Data.SQLite
1004 taskItem.Name = (String)row["name"]; 1004 taskItem.Name = (String)row["name"];
1005 taskItem.Description = (String)row["description"]; 1005 taskItem.Description = (String)row["description"];
1006 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1006 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1007 taskItem.CreatorID = new LLUUID((String)row["creatorID"]); 1007 taskItem.CreatorID = new UUID((String)row["creatorID"]);
1008 taskItem.OwnerID = new LLUUID((String)row["ownerID"]); 1008 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1009 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1009 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1010 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1010 taskItem.GroupID = new UUID((String)row["groupID"]);
1011 1011
1012 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); 1012 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1013 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); 1013 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
@@ -1028,7 +1028,7 @@ namespace OpenSim.Data.SQLite
1028 { 1028 {
1029 LandData newData = new LandData(); 1029 LandData newData = new LandData();
1030 1030
1031 newData.GlobalID = new LLUUID((String) row["UUID"]); 1031 newData.GlobalID = new UUID((String) row["UUID"]);
1032 newData.LocalID = Convert.ToInt32(row["LocalLandID"]); 1032 newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
1033 1033
1034 // Bitmap is a byte[512] 1034 // Bitmap is a byte[512]
@@ -1041,17 +1041,17 @@ namespace OpenSim.Data.SQLite
1041 newData.Area = Convert.ToInt32(row["Area"]); 1041 newData.Area = Convert.ToInt32(row["Area"]);
1042 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented 1042 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
1043 newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]); 1043 newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]);
1044 //Enum libsecondlife.Parcel.ParcelCategory 1044 //Enum OpenMetaverse.Parcel.ParcelCategory
1045 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 1045 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1046 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 1046 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1047 newData.GroupID = new LLUUID((String) row["GroupUUID"]); 1047 newData.GroupID = new UUID((String) row["GroupUUID"]);
1048 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 1048 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1049 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]); 1049 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1050 //Enum. libsecondlife.Parcel.ParcelStatus 1050 //Enum. OpenMetaverse.Parcel.ParcelStatus
1051 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 1051 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1052 newData.LandingType = (Byte) row["LandingType"]; 1052 newData.LandingType = (Byte) row["LandingType"];
1053 newData.MediaAutoScale = (Byte) row["MediaAutoScale"]; 1053 newData.MediaAutoScale = (Byte) row["MediaAutoScale"];
1054 newData.MediaID = new LLUUID((String) row["MediaTextureUUID"]); 1054 newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
1055 newData.MediaURL = (String) row["MediaURL"]; 1055 newData.MediaURL = (String) row["MediaURL"];
1056 newData.MusicURL = (String) row["MusicURL"]; 1056 newData.MusicURL = (String) row["MusicURL"];
1057 newData.PassHours = Convert.ToSingle(row["PassHours"]); 1057 newData.PassHours = Convert.ToSingle(row["PassHours"]);
@@ -1061,25 +1061,25 @@ namespace OpenSim.Data.SQLite
1061 { 1061 {
1062 1062
1063 newData.UserLocation = 1063 newData.UserLocation =
1064 new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), 1064 new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
1065 Convert.ToSingle(row["UserLocationZ"])); 1065 Convert.ToSingle(row["UserLocationZ"]));
1066 newData.UserLookAt = 1066 newData.UserLookAt =
1067 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), 1067 new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
1068 Convert.ToSingle(row["UserLookAtZ"])); 1068 Convert.ToSingle(row["UserLookAtZ"]));
1069 1069
1070 } 1070 }
1071 catch (InvalidCastException) 1071 catch (InvalidCastException)
1072 { 1072 {
1073 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 1073 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
1074 newData.UserLocation = LLVector3.Zero; 1074 newData.UserLocation = Vector3.Zero;
1075 newData.UserLookAt = LLVector3.Zero; 1075 newData.UserLookAt = Vector3.Zero;
1076 } 1076 }
1077 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); 1077 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
1078 LLUUID authBuyerID = LLUUID.Zero; 1078 UUID authBuyerID = UUID.Zero;
1079 1079
1080 try 1080 try
1081 { 1081 {
1082 Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID); 1082 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
1083 } 1083 }
1084 catch (InvalidCastException) 1084 catch (InvalidCastException)
1085 { 1085 {
@@ -1120,7 +1120,7 @@ namespace OpenSim.Data.SQLite
1120 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) 1120 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
1121 { 1121 {
1122 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 1122 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1123 entry.AgentID = new LLUUID((string) row["AccessUUID"]); 1123 entry.AgentID = new UUID((string) row["AccessUUID"]);
1124 entry.Flags = (ParcelManager.AccessList) row["Flags"]; 1124 entry.Flags = (ParcelManager.AccessList) row["Flags"];
1125 entry.Time = new DateTime(); 1125 entry.Time = new DateTime();
1126 return entry; 1126 return entry;
@@ -1144,7 +1144,7 @@ namespace OpenSim.Data.SQLite
1144 return str.ToArray(); 1144 return str.ToArray();
1145 } 1145 }
1146 1146
1147// private void fillTerrainRow(DataRow row, LLUUID regionUUID, int rev, double[,] val) 1147// private void fillTerrainRow(DataRow row, UUID regionUUID, int rev, double[,] val)
1148// { 1148// {
1149// row["RegionUUID"] = regionUUID; 1149// row["RegionUUID"] = regionUUID;
1150// row["Revision"] = rev; 1150// row["Revision"] = rev;
@@ -1167,7 +1167,7 @@ namespace OpenSim.Data.SQLite
1167 /// <param name="prim"></param> 1167 /// <param name="prim"></param>
1168 /// <param name="sceneGroupID"></param> 1168 /// <param name="sceneGroupID"></param>
1169 /// <param name="regionUUID"></param> 1169 /// <param name="regionUUID"></param>
1170 private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1170 private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1171 { 1171 {
1172 row["UUID"] = Util.ToRawUuidString(prim.UUID); 1172 row["UUID"] = Util.ToRawUuidString(prim.UUID);
1173 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1173 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1215,12 +1215,12 @@ namespace OpenSim.Data.SQLite
1215 row["RotationW"] = prim.RotationOffset.W; 1215 row["RotationW"] = prim.RotationOffset.W;
1216 1216
1217 // Sit target 1217 // Sit target
1218 LLVector3 sitTargetPos = prim.SitTargetPositionLL; 1218 Vector3 sitTargetPos = prim.SitTargetPositionLL;
1219 row["SitTargetOffsetX"] = sitTargetPos.X; 1219 row["SitTargetOffsetX"] = sitTargetPos.X;
1220 row["SitTargetOffsetY"] = sitTargetPos.Y; 1220 row["SitTargetOffsetY"] = sitTargetPos.Y;
1221 row["SitTargetOffsetZ"] = sitTargetPos.Z; 1221 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1222 1222
1223 LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; 1223 Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
1224 row["SitTargetOrientW"] = sitTargetOrient.W; 1224 row["SitTargetOrientW"] = sitTargetOrient.W;
1225 row["SitTargetOrientX"] = sitTargetOrient.X; 1225 row["SitTargetOrientX"] = sitTargetOrient.X;
1226 row["SitTargetOrientY"] = sitTargetOrient.Y; 1226 row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1263,7 +1263,7 @@ namespace OpenSim.Data.SQLite
1263 /// <param name="row"></param> 1263 /// <param name="row"></param>
1264 /// <param name="land"></param> 1264 /// <param name="land"></param>
1265 /// <param name="regionUUID"></param> 1265 /// <param name="regionUUID"></param>
1266 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1266 private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
1267 { 1267 {
1268 row["UUID"] = Util.ToRawUuidString(land.GlobalID); 1268 row["UUID"] = Util.ToRawUuidString(land.GlobalID);
1269 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1269 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1278,12 +1278,12 @@ namespace OpenSim.Data.SQLite
1278 row["IsGroupOwned"] = land.IsGroupOwned; 1278 row["IsGroupOwned"] = land.IsGroupOwned;
1279 row["Area"] = land.Area; 1279 row["Area"] = land.Area;
1280 row["AuctionID"] = land.AuctionID; //Unemplemented 1280 row["AuctionID"] = land.AuctionID; //Unemplemented
1281 row["Category"] = land.Category; //Enum libsecondlife.Parcel.ParcelCategory 1281 row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
1282 row["ClaimDate"] = land.ClaimDate; 1282 row["ClaimDate"] = land.ClaimDate;
1283 row["ClaimPrice"] = land.ClaimPrice; 1283 row["ClaimPrice"] = land.ClaimPrice;
1284 row["GroupUUID"] = Util.ToRawUuidString(land.GroupID); 1284 row["GroupUUID"] = Util.ToRawUuidString(land.GroupID);
1285 row["SalePrice"] = land.SalePrice; 1285 row["SalePrice"] = land.SalePrice;
1286 row["LandStatus"] = land.Status; //Enum. libsecondlife.Parcel.ParcelStatus 1286 row["LandStatus"] = land.Status; //Enum. OpenMetaverse.Parcel.ParcelStatus
1287 row["LandFlags"] = land.Flags; 1287 row["LandFlags"] = land.Flags;
1288 row["LandingType"] = land.LandingType; 1288 row["LandingType"] = land.LandingType;
1289 row["MediaAutoScale"] = land.MediaAutoScale; 1289 row["MediaAutoScale"] = land.MediaAutoScale;
@@ -1308,7 +1308,7 @@ namespace OpenSim.Data.SQLite
1308 /// <param name="row"></param> 1308 /// <param name="row"></param>
1309 /// <param name="entry"></param> 1309 /// <param name="entry"></param>
1310 /// <param name="parcelID"></param> 1310 /// <param name="parcelID"></param>
1311 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) 1311 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
1312 { 1312 {
1313 row["LandUUID"] = Util.ToRawUuidString(parcelID); 1313 row["LandUUID"] = Util.ToRawUuidString(parcelID);
1314 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); 1314 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID);
@@ -1323,7 +1323,7 @@ namespace OpenSim.Data.SQLite
1323 private PrimitiveBaseShape buildShape(DataRow row) 1323 private PrimitiveBaseShape buildShape(DataRow row)
1324 { 1324 {
1325 PrimitiveBaseShape s = new PrimitiveBaseShape(); 1325 PrimitiveBaseShape s = new PrimitiveBaseShape();
1326 s.Scale = new LLVector3( 1326 s.Scale = new Vector3(
1327 Convert.ToSingle(row["ScaleX"]), 1327 Convert.ToSingle(row["ScaleX"]),
1328 Convert.ToSingle(row["ScaleY"]), 1328 Convert.ToSingle(row["ScaleY"]),
1329 Convert.ToSingle(row["ScaleZ"]) 1329 Convert.ToSingle(row["ScaleZ"])
@@ -1418,7 +1418,7 @@ namespace OpenSim.Data.SQLite
1418 /// <param name="prim"></param> 1418 /// <param name="prim"></param>
1419 /// <param name="sceneGroupID"></param> 1419 /// <param name="sceneGroupID"></param>
1420 /// <param name="regionUUID"></param> 1420 /// <param name="regionUUID"></param>
1421 private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1421 private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1422 { 1422 {
1423 DataTable prims = ds.Tables["prims"]; 1423 DataTable prims = ds.Tables["prims"];
1424 DataTable shapes = ds.Tables["primshapes"]; 1424 DataTable shapes = ds.Tables["primshapes"];
@@ -1453,7 +1453,7 @@ namespace OpenSim.Data.SQLite
1453 /// </summary> 1453 /// </summary>
1454 /// <param name="primID"></param> 1454 /// <param name="primID"></param>
1455 /// <param name="items"></param> 1455 /// <param name="items"></param>
1456 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 1456 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
1457 { 1457 {
1458 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID); 1458 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
1459 1459
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index ae3cb72..7f1fd62 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -59,7 +59,7 @@ namespace OpenSim.Data.SQLite
59 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname"; 59 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
60 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname"; 60 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
61 61
62 private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>(); 62 private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
63 private DataSet ds; 63 private DataSet ds;
64 private SqliteDataAdapter da; 64 private SqliteDataAdapter da;
65 private SqliteDataAdapter daf; 65 private SqliteDataAdapter daf;
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
124 /// </summary> 124 /// </summary>
125 /// <param name="uuid">User UUID</param> 125 /// <param name="uuid">User UUID</param>
126 /// <returns>user profile data</returns> 126 /// <returns>user profile data</returns>
127 override public UserProfileData GetUserByUUID(LLUUID uuid) 127 override public UserProfileData GetUserByUUID(UUID uuid)
128 { 128 {
129 lock (ds) 129 lock (ds)
130 { 130 {
@@ -184,21 +184,21 @@ namespace OpenSim.Data.SQLite
184 /// <param name="friendlistowner">UUID of the friendlist owner</param> 184 /// <param name="friendlistowner">UUID of the friendlist owner</param>
185 /// <param name="friend">UUID of the friend to add</param> 185 /// <param name="friend">UUID of the friend to add</param>
186 /// <param name="perms">permission flag</param> 186 /// <param name="perms">permission flag</param>
187 override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 187 override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
188 { 188 {
189 string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)"; 189 string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
190 190
191 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn)) 191 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
192 { 192 {
193 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 193 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
194 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 194 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
195 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 195 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
196 cmd.ExecuteNonQuery(); 196 cmd.ExecuteNonQuery();
197 } 197 }
198 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn)) 198 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
199 { 199 {
200 cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.UUID.ToString())); 200 cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.ToString()));
201 cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.UUID.ToString())); 201 cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.ToString()));
202 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 202 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
203 cmd.ExecuteNonQuery(); 203 cmd.ExecuteNonQuery();
204 } 204 }
@@ -209,13 +209,13 @@ namespace OpenSim.Data.SQLite
209 /// </summary> 209 /// </summary>
210 /// <param name="friendlistowner">UUID of the friendlist owner</param> 210 /// <param name="friendlistowner">UUID of the friendlist owner</param>
211 /// <param name="friend">UUID of the friend to remove</param> 211 /// <param name="friend">UUID of the friend to remove</param>
212 override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 212 override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
213 { 213 {
214 string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)"; 214 string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
215 using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn)) 215 using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn))
216 { 216 {
217 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 217 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
218 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 218 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
219 cmd.ExecuteNonQuery(); 219 cmd.ExecuteNonQuery();
220 } 220 }
221 } 221 }
@@ -226,14 +226,14 @@ namespace OpenSim.Data.SQLite
226 /// <param name="friendlistowner">UUID of the friendlist owner</param> 226 /// <param name="friendlistowner">UUID of the friendlist owner</param>
227 /// <param name="friend">UUID of the friend to modify</param> 227 /// <param name="friend">UUID of the friend to modify</param>
228 /// <param name="perms">updated permission flag</param> 228 /// <param name="perms">updated permission flag</param>
229 override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 229 override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
230 { 230 {
231 string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID"; 231 string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID";
232 using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn)) 232 using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn))
233 { 233 {
234 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 234 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
235 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 235 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
236 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 236 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
237 cmd.ExecuteNonQuery(); 237 cmd.ExecuteNonQuery();
238 } 238 }
239 } 239 }
@@ -243,13 +243,13 @@ namespace OpenSim.Data.SQLite
243 /// </summary> 243 /// </summary>
244 /// <param name="friendlistowner">UUID of the friendlist owner</param> 244 /// <param name="friendlistowner">UUID of the friendlist owner</param>
245 /// <returns>The friendlist list</returns> 245 /// <returns>The friendlist list</returns>
246 override public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 246 override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
247 { 247 {
248 List<FriendListItem> returnlist = new List<FriendListItem>(); 248 List<FriendListItem> returnlist = new List<FriendListItem>();
249 249
250 using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn)) 250 using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn))
251 { 251 {
252 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 252 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
253 253
254 try 254 try
255 { 255 {
@@ -259,7 +259,7 @@ namespace OpenSim.Data.SQLite
259 { 259 {
260 FriendListItem user = new FriendListItem(); 260 FriendListItem user = new FriendListItem();
261 user.FriendListOwner = friendlistowner; 261 user.FriendListOwner = friendlistowner;
262 user.Friend = new LLUUID((string)reader[0]); 262 user.Friend = new UUID((string)reader[0]);
263 user.FriendPerms = Convert.ToUInt32(reader[1]); 263 user.FriendPerms = Convert.ToUInt32(reader[1]);
264 user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]); 264 user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]);
265 returnlist.Add(user); 265 returnlist.Add(user);
@@ -288,7 +288,7 @@ namespace OpenSim.Data.SQLite
288 /// <param name="regionuuid">UUID of the region</param> 288 /// <param name="regionuuid">UUID of the region</param>
289 /// <param name="regionhandle">region handle</param> 289 /// <param name="regionhandle">region handle</param>
290 /// <remarks>DO NOTHING</remarks> 290 /// <remarks>DO NOTHING</remarks>
291 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 291 override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
292 { 292 {
293 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); 293 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
294 } 294 }
@@ -299,7 +299,7 @@ namespace OpenSim.Data.SQLite
299 /// <param name="queryID"></param> 299 /// <param name="queryID"></param>
300 /// <param name="query"></param> 300 /// <param name="query"></param>
301 /// <returns></returns> 301 /// <returns></returns>
302 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 302 override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
303 { 303 {
304 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 304 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
305 string[] querysplit; 305 string[] querysplit;
@@ -316,7 +316,7 @@ namespace OpenSim.Data.SQLite
316 while (reader.Read()) 316 while (reader.Read())
317 { 317 {
318 AvatarPickerAvatar user = new AvatarPickerAvatar(); 318 AvatarPickerAvatar user = new AvatarPickerAvatar();
319 user.AvatarID = new LLUUID((string) reader["UUID"]); 319 user.AvatarID = new UUID((string) reader["UUID"]);
320 user.firstName = (string) reader["username"]; 320 user.firstName = (string) reader["username"];
321 user.lastName = (string) reader["surname"]; 321 user.lastName = (string) reader["surname"];
322 returnlist.Add(user); 322 returnlist.Add(user);
@@ -337,7 +337,7 @@ namespace OpenSim.Data.SQLite
337 while (reader.Read()) 337 while (reader.Read())
338 { 338 {
339 AvatarPickerAvatar user = new AvatarPickerAvatar(); 339 AvatarPickerAvatar user = new AvatarPickerAvatar();
340 user.AvatarID = new LLUUID((string) reader["UUID"]); 340 user.AvatarID = new UUID((string) reader["UUID"]);
341 user.firstName = (string) reader["username"]; 341 user.firstName = (string) reader["username"];
342 user.lastName = (string) reader["surname"]; 342 user.lastName = (string) reader["surname"];
343 returnlist.Add(user); 343 returnlist.Add(user);
@@ -354,7 +354,7 @@ namespace OpenSim.Data.SQLite
354 /// </summary> 354 /// </summary>
355 /// <param name="uuid">The user's account ID</param> 355 /// <param name="uuid">The user's account ID</param>
356 /// <returns>A matching user profile</returns> 356 /// <returns>A matching user profile</returns>
357 override public UserAgentData GetAgentByUUID(LLUUID uuid) 357 override public UserAgentData GetAgentByUUID(UUID uuid)
358 { 358 {
359 try 359 try
360 { 360 {
@@ -399,7 +399,7 @@ namespace OpenSim.Data.SQLite
399 /// </summary> 399 /// </summary>
400 /// <param name="AgentID">UUID of the user</param> 400 /// <param name="AgentID">UUID of the user</param>
401 /// <param name="WebLoginKey">UUID of the weblogin</param> 401 /// <param name="WebLoginKey">UUID of the weblogin</param>
402 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 402 override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
403 { 403 {
404 DataTable users = ds.Tables["users"]; 404 DataTable users = ds.Tables["users"];
405 lock (ds) 405 lock (ds)
@@ -520,7 +520,7 @@ namespace OpenSim.Data.SQLite
520 /// <param name="to">End account</param> 520 /// <param name="to">End account</param>
521 /// <param name="amount">The amount to move</param> 521 /// <param name="amount">The amount to move</param>
522 /// <returns>Success?</returns> 522 /// <returns>Success?</returns>
523 override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 523 override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
524 { 524 {
525 return true; 525 return true;
526 } 526 }
@@ -533,7 +533,7 @@ namespace OpenSim.Data.SQLite
533 /// <param name="to">Receivers account</param> 533 /// <param name="to">Receivers account</param>
534 /// <param name="item">Inventory item</param> 534 /// <param name="item">Inventory item</param>
535 /// <returns>Success?</returns> 535 /// <returns>Success?</returns>
536 override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 536 override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
537 { 537 {
538 return true; 538 return true;
539 } 539 }
@@ -545,7 +545,7 @@ namespace OpenSim.Data.SQLite
545 /// </summary> 545 /// </summary>
546 /// <param name="user">The user UUID</param> 546 /// <param name="user">The user UUID</param>
547 /// <returns>Avatar Appearence</returns> 547 /// <returns>Avatar Appearence</returns>
548 override public AvatarAppearance GetUserAppearance(LLUUID user) 548 override public AvatarAppearance GetUserAppearance(UUID user)
549 { 549 {
550 AvatarAppearance aa = null; 550 AvatarAppearance aa = null;
551 try { 551 try {
@@ -562,7 +562,7 @@ namespace OpenSim.Data.SQLite
562 /// </summary> 562 /// </summary>
563 /// <param name="user">the user UUID</param> 563 /// <param name="user">the user UUID</param>
564 /// <param name="appearance">appearence</param> 564 /// <param name="appearance">appearence</param>
565 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 565 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
566 { 566 {
567 appearance.Owner = user; 567 appearance.Owner = user;
568 aplist[user] = appearance; 568 aplist[user] = appearance;
@@ -707,8 +707,8 @@ namespace OpenSim.Data.SQLite
707 private static UserProfileData buildUserProfile(DataRow row) 707 private static UserProfileData buildUserProfile(DataRow row)
708 { 708 {
709 UserProfileData user = new UserProfileData(); 709 UserProfileData user = new UserProfileData();
710 LLUUID tmp; 710 UUID tmp;
711 LLUUID.TryParse((String)row["UUID"], out tmp); 711 UUID.TryParse((String)row["UUID"], out tmp);
712 user.ID = tmp; 712 user.ID = tmp;
713 user.FirstName = (String) row["username"]; 713 user.FirstName = (String) row["username"];
714 user.SurName = (String) row["surname"]; 714 user.SurName = (String) row["surname"];
@@ -717,39 +717,39 @@ namespace OpenSim.Data.SQLite
717 717
718 user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]); 718 user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]);
719 user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]); 719 user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]);
720 user.HomeLocation = new LLVector3( 720 user.HomeLocation = new Vector3(
721 Convert.ToSingle(row["homeLocationX"]), 721 Convert.ToSingle(row["homeLocationX"]),
722 Convert.ToSingle(row["homeLocationY"]), 722 Convert.ToSingle(row["homeLocationY"]),
723 Convert.ToSingle(row["homeLocationZ"]) 723 Convert.ToSingle(row["homeLocationZ"])
724 ); 724 );
725 user.HomeLookAt = new LLVector3( 725 user.HomeLookAt = new Vector3(
726 Convert.ToSingle(row["homeLookAtX"]), 726 Convert.ToSingle(row["homeLookAtX"]),
727 Convert.ToSingle(row["homeLookAtY"]), 727 Convert.ToSingle(row["homeLookAtY"]),
728 Convert.ToSingle(row["homeLookAtZ"]) 728 Convert.ToSingle(row["homeLookAtZ"])
729 ); 729 );
730 730
731 LLUUID regionID = LLUUID.Zero; 731 UUID regionID = UUID.Zero;
732 LLUUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero 732 UUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
733 user.HomeRegionID = regionID; 733 user.HomeRegionID = regionID;
734 734
735 user.Created = Convert.ToInt32(row["created"]); 735 user.Created = Convert.ToInt32(row["created"]);
736 user.LastLogin = Convert.ToInt32(row["lastLogin"]); 736 user.LastLogin = Convert.ToInt32(row["lastLogin"]);
737 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); 737 user.RootInventoryFolderID = new UUID((String) row["rootInventoryFolderID"]);
738 user.UserInventoryURI = (String) row["userInventoryURI"]; 738 user.UserInventoryURI = (String) row["userInventoryURI"];
739 user.UserAssetURI = (String) row["userAssetURI"]; 739 user.UserAssetURI = (String) row["userAssetURI"];
740 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); 740 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
741 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); 741 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
742 user.AboutText = (String) row["profileAboutText"]; 742 user.AboutText = (String) row["profileAboutText"];
743 user.FirstLifeAboutText = (String) row["profileFirstText"]; 743 user.FirstLifeAboutText = (String) row["profileFirstText"];
744 LLUUID.TryParse((String)row["profileImage"], out tmp); 744 UUID.TryParse((String)row["profileImage"], out tmp);
745 user.Image = tmp; 745 user.Image = tmp;
746 LLUUID.TryParse((String)row["profileFirstImage"], out tmp); 746 UUID.TryParse((String)row["profileFirstImage"], out tmp);
747 user.FirstLifeImage = tmp; 747 user.FirstLifeImage = tmp;
748 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]); 748 user.WebLoginKey = new UUID((String) row["webLoginKey"]);
749 user.UserFlags = Convert.ToInt32(row["userFlags"]); 749 user.UserFlags = Convert.ToInt32(row["userFlags"]);
750 user.GodLevel = Convert.ToInt32(row["godLevel"]); 750 user.GodLevel = Convert.ToInt32(row["godLevel"]);
751 user.CustomType = row["customType"].ToString(); 751 user.CustomType = row["customType"].ToString();
752 user.Partner = new LLUUID((String) row["partner"]); 752 user.Partner = new UUID((String) row["partner"]);
753 753
754 return user; 754 return user;
755 } 755 }
@@ -814,18 +814,18 @@ namespace OpenSim.Data.SQLite
814 { 814 {
815 UserAgentData ua = new UserAgentData(); 815 UserAgentData ua = new UserAgentData();
816 816
817 ua.ProfileID = new LLUUID((String) row["UUID"]); 817 ua.ProfileID = new UUID((String) row["UUID"]);
818 ua.AgentIP = (String) row["agentIP"]; 818 ua.AgentIP = (String) row["agentIP"];
819 ua.AgentPort = Convert.ToUInt32(row["agentPort"]); 819 ua.AgentPort = Convert.ToUInt32(row["agentPort"]);
820 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]); 820 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
821 ua.SessionID = new LLUUID((String) row["sessionID"]); 821 ua.SessionID = new UUID((String) row["sessionID"]);
822 ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]); 822 ua.SecureSessionID = new UUID((String) row["secureSessionID"]);
823 ua.InitialRegion = new LLUUID((String) row["regionID"]); 823 ua.InitialRegion = new UUID((String) row["regionID"]);
824 ua.LoginTime = Convert.ToInt32(row["loginTime"]); 824 ua.LoginTime = Convert.ToInt32(row["loginTime"]);
825 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]); 825 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
826 ua.Region = new LLUUID((String) row["currentRegion"]); 826 ua.Region = new UUID((String) row["currentRegion"]);
827 ua.Handle = Convert.ToUInt64(row["currentHandle"]); 827 ua.Handle = Convert.ToUInt64(row["currentHandle"]);
828 ua.Position = new LLVector3( 828 ua.Position = new Vector3(
829 Convert.ToSingle(row["currentPosX"]), 829 Convert.ToSingle(row["currentPosX"]),
830 Convert.ToSingle(row["currentPosY"]), 830 Convert.ToSingle(row["currentPosY"]),
831 Convert.ToSingle(row["currentPosZ"]) 831 Convert.ToSingle(row["currentPosZ"])
@@ -906,7 +906,7 @@ namespace OpenSim.Data.SQLite
906 906
907 } 907 }
908 908
909 override public void ResetAttachments(LLUUID userID) 909 override public void ResetAttachments(UUID userID)
910 { 910 {
911 } 911 }
912 } 912 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index e57c8f8..33b8a94 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -27,7 +27,7 @@
27 27
28using System.Reflection; 28using System.Reflection;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31using log4net; 31using log4net;
32using OpenSim.Framework; 32using OpenSim.Framework;
33 33
@@ -37,28 +37,28 @@ namespace OpenSim.Data
37 { 37 {
38 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 38 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 39
40 // private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>(); 40 // private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
41 41
42 public abstract UserProfileData GetUserByUUID(LLUUID user); 42 public abstract UserProfileData GetUserByUUID(UUID user);
43 public abstract UserProfileData GetUserByName(string fname, string lname); 43 public abstract UserProfileData GetUserByName(string fname, string lname);
44 public abstract UserAgentData GetAgentByUUID(LLUUID user); 44 public abstract UserAgentData GetAgentByUUID(UUID user);
45 public abstract UserAgentData GetAgentByName(string name); 45 public abstract UserAgentData GetAgentByName(string name);
46 public abstract UserAgentData GetAgentByName(string fname, string lname); 46 public abstract UserAgentData GetAgentByName(string fname, string lname);
47 public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey); 47 public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
48 public abstract void AddNewUserProfile(UserProfileData user); 48 public abstract void AddNewUserProfile(UserProfileData user);
49 public abstract bool UpdateUserProfile(UserProfileData user); 49 public abstract bool UpdateUserProfile(UserProfileData user);
50 public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle); 50 public abstract void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle);
51 public abstract void AddNewUserAgent(UserAgentData agent); 51 public abstract void AddNewUserAgent(UserAgentData agent);
52 public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms); 52 public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
53 public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend); 53 public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend);
54 public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms); 54 public abstract void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
55 public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 55 public abstract List<FriendListItem> GetUserFriendList(UUID friendlistowner);
56 public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); 56 public abstract bool MoneyTransferRequest(UUID from, UUID to, uint amount);
57 public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); 57 public abstract bool InventoryTransferRequest(UUID from, UUID to, UUID inventory);
58 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 58 public abstract List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query);
59 public abstract AvatarAppearance GetUserAppearance(LLUUID user); 59 public abstract AvatarAppearance GetUserAppearance(UUID user);
60 public abstract void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); 60 public abstract void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
61 // public virtual AvatarAppearance GetUserAppearance(LLUUID user) { 61 // public virtual AvatarAppearance GetUserAppearance(UUID user) {
62 // AvatarAppearance aa = null; 62 // AvatarAppearance aa = null;
63 // try { 63 // try {
64 // aa = aplist[user]; 64 // aa = aplist[user];
@@ -68,11 +68,11 @@ namespace OpenSim.Data
68 // } 68 // }
69 // return aa; 69 // return aa;
70 // } 70 // }
71 // public virtual void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { 71 // public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance) {
72 // aplist[user] = appearance; 72 // aplist[user] = appearance;
73 // m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString()); 73 // m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString());
74 // } 74 // }
75 public abstract void ResetAttachments(LLUUID userID); 75 public abstract void ResetAttachments(UUID userID);
76 76
77 public abstract string Version {get;} 77 public abstract string Version {get;}
78 public abstract string Name {get;} 78 public abstract string Name {get;}