aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs57
1 files changed, 50 insertions, 7 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 1bff28d..e83ea14 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -1139,21 +1139,64 @@ ELSE
1139 Convert.ToSingle(reader["homeLookAtY"].ToString()), 1139 Convert.ToSingle(reader["homeLookAtY"].ToString()),
1140 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 1140 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
1141 1141
1142 if (reader.IsDBNull(reader.GetOrdinal("homeRegionID")))
1143 retval.HomeRegionID = UUID.Zero;
1144 else
1145 retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]);
1146
1142 retval.Created = Convert.ToInt32(reader["created"].ToString()); 1147 retval.Created = Convert.ToInt32(reader["created"].ToString());
1143 retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); 1148 retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
1144 1149
1145 retval.UserInventoryURI = (string)reader["userInventoryURI"]; 1150 if (reader.IsDBNull(reader.GetOrdinal("userInventoryURI")))
1146 retval.UserAssetURI = (string)reader["userAssetURI"]; 1151 retval.UserInventoryURI = "";
1152 else
1153 retval.UserInventoryURI = (string)reader["userInventoryURI"];
1154
1155 if (reader.IsDBNull(reader.GetOrdinal("userAssetURI")))
1156 retval.UserAssetURI = "";
1157 else
1158 retval.UserAssetURI = (string)reader["userAssetURI"];
1147 1159
1148 retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); 1160 retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
1149 retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); 1161 retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
1150 1162
1151 retval.AboutText = (string)reader["profileAboutText"];
1152 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
1153 1163
1154 retval.Image = new UUID((Guid)reader["profileImage"]); 1164 if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
1155 retval.FirstLifeImage = new UUID((Guid)reader["profileFirstImage"]); 1165 retval.AboutText = "";
1156 retval.WebLoginKey = new UUID((Guid)reader["webLoginKey"]); 1166 else
1167 retval.AboutText = (string)reader["profileAboutText"];
1168
1169 if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
1170 retval.FirstLifeAboutText = "";
1171 else
1172 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
1173
1174 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
1175 retval.Image = UUID.Zero;
1176 else
1177 retval.Image = new UUID((Guid)reader["profileImage"]);
1178
1179 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
1180 retval.Image = UUID.Zero;
1181 else
1182 retval.FirstLifeImage = new UUID((Guid)reader["profileFirstImage"]);
1183
1184 if (reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
1185 retval.WebLoginKey = UUID.Zero;
1186 else
1187 retval.WebLoginKey = new UUID((Guid)reader["webLoginKey"]);
1188
1189 retval.UserFlags = Convert.ToInt32(reader["userFlags"].ToString());
1190 retval.GodLevel = Convert.ToInt32(reader["godLevel"].ToString());
1191 if (reader.IsDBNull(reader.GetOrdinal("customType")))
1192 retval.CustomType = "";
1193 else
1194 retval.CustomType = reader["customType"].ToString();
1195
1196 if (reader.IsDBNull(reader.GetOrdinal("partner")))
1197 retval.Partner = UUID.Zero;
1198 else
1199 retval.Partner = new UUID((Guid)reader["partner"]);
1157 } 1200 }
1158 else 1201 else
1159 { 1202 {