diff options
Diffstat (limited to '')
23 files changed, 295 insertions, 103 deletions
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs index e1a810c..b4ae913 100644 --- a/OpenSim/Data/AssetDataBase.cs +++ b/OpenSim/Data/AssetDataBase.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Data | |||
38 | { | 38 | { |
39 | public abstract AssetBase GetAsset(UUID uuid); | 39 | public abstract AssetBase GetAsset(UUID uuid); |
40 | 40 | ||
41 | public abstract void StoreAsset(AssetBase asset); | 41 | public abstract bool StoreAsset(AssetBase asset); |
42 | public abstract bool ExistsAsset(UUID uuid); | 42 | public abstract bool ExistsAsset(UUID uuid); |
43 | 43 | ||
44 | public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count); | 44 | public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count); |
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs index f31b215c..0c8eadd 100644 --- a/OpenSim/Data/IAssetData.cs +++ b/OpenSim/Data/IAssetData.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Data | |||
34 | public interface IAssetDataPlugin : IPlugin | 34 | public interface IAssetDataPlugin : IPlugin |
35 | { | 35 | { |
36 | AssetBase GetAsset(UUID uuid); | 36 | AssetBase GetAsset(UUID uuid); |
37 | void StoreAsset(AssetBase asset); | 37 | bool StoreAsset(AssetBase asset); |
38 | bool ExistsAsset(UUID uuid); | 38 | bool ExistsAsset(UUID uuid); |
39 | List<AssetMetadata> FetchAssetMetadataSet(int start, int count); | 39 | List<AssetMetadata> FetchAssetMetadataSet(int start, int count); |
40 | void Initialise(string connect); | 40 | void Initialise(string connect); |
diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs index 906ba6c..bc7eda7 100644 --- a/OpenSim/Data/IUserAccountData.cs +++ b/OpenSim/Data/IUserAccountData.cs | |||
@@ -50,5 +50,6 @@ namespace OpenSim.Data | |||
50 | bool Store(UserAccountData data); | 50 | bool Store(UserAccountData data); |
51 | bool Delete(string field, string val); | 51 | bool Delete(string field, string val); |
52 | UserAccountData[] GetUsers(UUID scopeID, string query); | 52 | UserAccountData[] GetUsers(UUID scopeID, string query); |
53 | UserAccountData[] GetUsersWhere(UUID scopeID, string where); | ||
53 | } | 54 | } |
54 | } | 55 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index c7488d8..c882555 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Data.MSSQL | |||
143 | /// Create asset in m_database | 143 | /// Create asset in m_database |
144 | /// </summary> | 144 | /// </summary> |
145 | /// <param name="asset">the asset</param> | 145 | /// <param name="asset">the asset</param> |
146 | override public void StoreAsset(AssetBase asset) | 146 | override public bool StoreAsset(AssetBase asset) |
147 | { | 147 | { |
148 | 148 | ||
149 | string sql = | 149 | string sql = |
@@ -192,10 +192,12 @@ namespace OpenSim.Data.MSSQL | |||
192 | try | 192 | try |
193 | { | 193 | { |
194 | command.ExecuteNonQuery(); | 194 | command.ExecuteNonQuery(); |
195 | return true; | ||
195 | } | 196 | } |
196 | catch(Exception e) | 197 | catch(Exception e) |
197 | { | 198 | { |
198 | m_log.Error("[ASSET DB]: Error storing item :" + e.Message); | 199 | m_log.Error("[ASSET DB]: Error storing item :" + e.Message); |
200 | return false; | ||
199 | } | 201 | } |
200 | } | 202 | } |
201 | } | 203 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs index 301b424..49a6b09 100644 --- a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL | |||
43 | public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>, | 43 | public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>, |
44 | IAvatarData | 44 | IAvatarData |
45 | { | 45 | { |
46 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public MSSQLAvatarData(string connectionString, string realm) : | 48 | public MSSQLAvatarData(string connectionString, string realm) : |
49 | base(connectionString, realm, "Avatar") | 49 | base(connectionString, realm, "Avatar") |
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs index 4145d95..8f471c4 100644 --- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs +++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs | |||
@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL | |||
40 | { | 40 | { |
41 | public class MSSQLGenericTableHandler<T> where T : class, new() | 41 | public class MSSQLGenericTableHandler<T> where T : class, new() |
42 | { | 42 | { |
43 | // private static readonly ILog m_log = | 43 | private static readonly ILog m_log = |
44 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | protected string m_ConnectionString; | 46 | protected string m_ConnectionString; |
47 | protected MSSQLManager m_database; //used for parameter type translation | 47 | protected MSSQLManager m_database; //used for parameter type translation |
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs index 9e215f9..1870273 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL | |||
43 | public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>, | 43 | public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>, |
44 | IGridUserData | 44 | IGridUserData |
45 | { | 45 | { |
46 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public MSSQLGridUserData(string connectionString, string realm) : | 48 | public MSSQLGridUserData(string connectionString, string realm) : |
49 | base(connectionString, realm, "GridUserStore") | 49 | base(connectionString, realm, "GridUserStore") |
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs index 9a0015c..62c38d3 100644 --- a/OpenSim/Data/MSSQL/MSSQLManager.cs +++ b/OpenSim/Data/MSSQL/MSSQLManager.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Data.MSSQL | |||
41 | /// </summary> | 41 | /// </summary> |
42 | public class MSSQLManager | 42 | public class MSSQLManager |
43 | { | 43 | { |
44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Connection string for ADO.net | 47 | /// Connection string for ADO.net |
@@ -185,6 +185,8 @@ namespace OpenSim.Data.MSSQL | |||
185 | return parameter; | 185 | return parameter; |
186 | } | 186 | } |
187 | 187 | ||
188 | private static readonly Dictionary<string, string> emptyDictionary = new Dictionary<string, string>(); | ||
189 | |||
188 | /// <summary> | 190 | /// <summary> |
189 | /// Checks if we need to do some migrations to the database | 191 | /// Checks if we need to do some migrations to the database |
190 | /// </summary> | 192 | /// </summary> |
diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs index 8068d23..e7b3d9c 100644 --- a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs +++ b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL | |||
43 | public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>, | 43 | public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>, |
44 | IPresenceData | 44 | IPresenceData |
45 | { | 45 | { |
46 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public MSSQLPresenceData(string connectionString, string realm) : | 48 | public MSSQLPresenceData(string connectionString, string realm) : |
49 | base(connectionString, realm, "Presence") | 49 | base(connectionString, realm, "Presence") |
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index 17f42e1..5bb6ec9 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
@@ -2203,6 +2203,11 @@ VALUES | |||
2203 | } | 2203 | } |
2204 | } | 2204 | } |
2205 | 2205 | ||
2206 | public UUID[] GetObjectIDs(UUID regionID) | ||
2207 | { | ||
2208 | return new UUID[0]; | ||
2209 | } | ||
2210 | |||
2206 | public void SaveExtra(UUID regionID, string name, string value) | 2211 | public void SaveExtra(UUID regionID, string name, string value) |
2207 | { | 2212 | { |
2208 | } | 2213 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs index 7feec91..dd0689c 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |||
@@ -242,5 +242,10 @@ namespace OpenSim.Data.MSSQL | |||
242 | return DoQuery(cmd); | 242 | return DoQuery(cmd); |
243 | } | 243 | } |
244 | } | 244 | } |
245 | |||
246 | public UserAccountData[] GetUsersWhere(UUID scopeID, string where) | ||
247 | { | ||
248 | return null; | ||
249 | } | ||
245 | } | 250 | } |
246 | } | 251 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs index 7ab0ebb..1bc6e3c 100644 --- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | |||
@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL | |||
40 | { | 40 | { |
41 | public class MSSQLXInventoryData : IXInventoryData | 41 | public class MSSQLXInventoryData : IXInventoryData |
42 | { | 42 | { |
43 | // private static readonly ILog m_log = LogManager.GetLogger( | 43 | private static readonly ILog m_log = LogManager.GetLogger( |
44 | // MethodBase.GetCurrentMethod().DeclaringType); | 44 | MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private MSSQLFolderHandler m_Folders; | 46 | private MSSQLFolderHandler m_Folders; |
47 | private MSSQLItemHandler m_Items; | 47 | private MSSQLItemHandler m_Items; |
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 73de64b..20df234 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -155,7 +155,7 @@ namespace OpenSim.Data.MySQL | |||
155 | /// </summary> | 155 | /// </summary> |
156 | /// <param name="asset">Asset UUID to create</param> | 156 | /// <param name="asset">Asset UUID to create</param> |
157 | /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> | 157 | /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks> |
158 | override public void StoreAsset(AssetBase asset) | 158 | override public bool StoreAsset(AssetBase asset) |
159 | { | 159 | { |
160 | lock (m_dbLock) | 160 | lock (m_dbLock) |
161 | { | 161 | { |
@@ -201,12 +201,14 @@ namespace OpenSim.Data.MySQL | |||
201 | cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags); | 201 | cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags); |
202 | cmd.Parameters.AddWithValue("?data", asset.Data); | 202 | cmd.Parameters.AddWithValue("?data", asset.Data); |
203 | cmd.ExecuteNonQuery(); | 203 | cmd.ExecuteNonQuery(); |
204 | return true; | ||
204 | } | 205 | } |
205 | } | 206 | } |
206 | catch (Exception e) | 207 | catch (Exception e) |
207 | { | 208 | { |
208 | m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}", | 209 | m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}", |
209 | asset.FullID, asset.Name, e.Message); | 210 | asset.FullID, asset.Name, e.Message); |
211 | return false; | ||
210 | } | 212 | } |
211 | } | 213 | } |
212 | } | 214 | } |
@@ -370,4 +372,4 @@ namespace OpenSim.Data.MySQL | |||
370 | 372 | ||
371 | #endregion | 373 | #endregion |
372 | } | 374 | } |
373 | } \ No newline at end of file | 375 | } |
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 995c6a5..f6731c0 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | |||
@@ -175,6 +175,11 @@ namespace OpenSim.Data.MySQL | |||
175 | int v = Convert.ToInt32(reader[name]); | 175 | int v = Convert.ToInt32(reader[name]); |
176 | m_Fields[name].SetValue(row, v); | 176 | m_Fields[name].SetValue(row, v); |
177 | } | 177 | } |
178 | else if (m_Fields[name].FieldType == typeof(uint)) | ||
179 | { | ||
180 | uint v = Convert.ToUInt32(reader[name]); | ||
181 | m_Fields[name].SetValue(row, v); | ||
182 | } | ||
178 | else | 183 | else |
179 | { | 184 | { |
180 | m_Fields[name].SetValue(row, reader[name]); | 185 | m_Fields[name].SetValue(row, reader[name]); |
@@ -302,4 +307,4 @@ namespace OpenSim.Data.MySQL | |||
302 | } | 307 | } |
303 | } | 308 | } |
304 | } | 309 | } |
305 | } \ No newline at end of file | 310 | } |
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index d562783..12c979a 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Data.MySQL | |||
66 | Initialise(connectionString); | 66 | Initialise(connectionString); |
67 | } | 67 | } |
68 | 68 | ||
69 | public void Initialise(string connectionString) | 69 | public virtual void Initialise(string connectionString) |
70 | { | 70 | { |
71 | m_connectionString = connectionString; | 71 | m_connectionString = connectionString; |
72 | 72 | ||
@@ -113,14 +113,16 @@ namespace OpenSim.Data.MySQL | |||
113 | 113 | ||
114 | public void Dispose() {} | 114 | public void Dispose() {} |
115 | 115 | ||
116 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) | 116 | public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID) |
117 | { | 117 | { |
118 | uint flags = obj.RootPart.GetEffectiveObjectFlags(); | 118 | uint flags = obj.RootPart.GetEffectiveObjectFlags(); |
119 | 119 | ||
120 | // Eligibility check | 120 | // Eligibility check |
121 | // | 121 | // |
122 | if ((flags & (uint)PrimFlags.Temporary) != 0) | 122 | // PrimFlags.Temporary is not used in OpenSim code and cannot |
123 | return; | 123 | // be guaranteed to always be clear. Don't check it. |
124 | // if ((flags & (uint)PrimFlags.Temporary) != 0) | ||
125 | // return; | ||
124 | if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0) | 126 | if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0) |
125 | return; | 127 | return; |
126 | 128 | ||
@@ -135,7 +137,7 @@ namespace OpenSim.Data.MySQL | |||
135 | foreach (SceneObjectPart prim in obj.Parts) | 137 | foreach (SceneObjectPart prim in obj.Parts) |
136 | { | 138 | { |
137 | cmd.Parameters.Clear(); | 139 | cmd.Parameters.Clear(); |
138 | 140 | ||
139 | cmd.CommandText = "replace into prims (" + | 141 | cmd.CommandText = "replace into prims (" + |
140 | "UUID, CreationDate, " + | 142 | "UUID, CreationDate, " + |
141 | "Name, Text, Description, " + | 143 | "Name, Text, Description, " + |
@@ -171,7 +173,11 @@ namespace OpenSim.Data.MySQL | |||
171 | "ParticleSystem, ClickAction, Material, " + | 173 | "ParticleSystem, ClickAction, Material, " + |
172 | "CollisionSound, CollisionSoundVolume, " + | 174 | "CollisionSound, CollisionSoundVolume, " + |
173 | "PassTouches, " + | 175 | "PassTouches, " + |
174 | "LinkNumber, MediaURL) values (" + "?UUID, " + | 176 | "PassCollisions, " + |
177 | "LinkNumber, MediaURL, KeyframeMotion, " + | ||
178 | "PhysicsShapeType, Density, GravityModifier, " + | ||
179 | "Friction, Restitution, Vehicle " + | ||
180 | ") values (" + "?UUID, " + | ||
175 | "?CreationDate, ?Name, ?Text, " + | 181 | "?CreationDate, ?Name, ?Text, " + |
176 | "?Description, ?SitName, ?TouchName, " + | 182 | "?Description, ?SitName, ?TouchName, " + |
177 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + | 183 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " + |
@@ -202,14 +208,17 @@ namespace OpenSim.Data.MySQL | |||
202 | "?SaleType, ?ColorR, ?ColorG, " + | 208 | "?SaleType, ?ColorR, ?ColorG, " + |
203 | "?ColorB, ?ColorA, ?ParticleSystem, " + | 209 | "?ColorB, ?ColorA, ?ParticleSystem, " + |
204 | "?ClickAction, ?Material, ?CollisionSound, " + | 210 | "?ClickAction, ?Material, ?CollisionSound, " + |
205 | "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)"; | 211 | "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " + |
206 | 212 | "?LinkNumber, ?MediaURL, ?KeyframeMotion, " + | |
213 | "?PhysicsShapeType, ?Density, ?GravityModifier, " + | ||
214 | "?Friction, ?Restitution, ?Vehicle)"; | ||
215 | |||
207 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); | 216 | FillPrimCommand(cmd, prim, obj.UUID, regionUUID); |
208 | 217 | ||
209 | ExecuteNonQuery(cmd); | 218 | ExecuteNonQuery(cmd); |
210 | 219 | ||
211 | cmd.Parameters.Clear(); | 220 | cmd.Parameters.Clear(); |
212 | 221 | ||
213 | cmd.CommandText = "replace into primshapes (" + | 222 | cmd.CommandText = "replace into primshapes (" + |
214 | "UUID, Shape, ScaleX, ScaleY, " + | 223 | "UUID, Shape, ScaleX, ScaleY, " + |
215 | "ScaleZ, PCode, PathBegin, PathEnd, " + | 224 | "ScaleZ, PCode, PathBegin, PathEnd, " + |
@@ -231,9 +240,9 @@ namespace OpenSim.Data.MySQL | |||
231 | "?ProfileEnd, ?ProfileCurve, " + | 240 | "?ProfileEnd, ?ProfileCurve, " + |
232 | "?ProfileHollow, ?Texture, ?ExtraParams, " + | 241 | "?ProfileHollow, ?Texture, ?ExtraParams, " + |
233 | "?State, ?Media)"; | 242 | "?State, ?Media)"; |
234 | 243 | ||
235 | FillShapeCommand(cmd, prim); | 244 | FillShapeCommand(cmd, prim); |
236 | 245 | ||
237 | ExecuteNonQuery(cmd); | 246 | ExecuteNonQuery(cmd); |
238 | } | 247 | } |
239 | } | 248 | } |
@@ -241,7 +250,7 @@ namespace OpenSim.Data.MySQL | |||
241 | } | 250 | } |
242 | } | 251 | } |
243 | 252 | ||
244 | public void RemoveObject(UUID obj, UUID regionUUID) | 253 | public virtual void RemoveObject(UUID obj, UUID regionUUID) |
245 | { | 254 | { |
246 | // m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID); | 255 | // m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID); |
247 | 256 | ||
@@ -390,7 +399,7 @@ namespace OpenSim.Data.MySQL | |||
390 | } | 399 | } |
391 | } | 400 | } |
392 | 401 | ||
393 | public List<SceneObjectGroup> LoadObjects(UUID regionID) | 402 | public virtual List<SceneObjectGroup> LoadObjects(UUID regionID) |
394 | { | 403 | { |
395 | const int ROWS_PER_QUERY = 5000; | 404 | const int ROWS_PER_QUERY = 5000; |
396 | 405 | ||
@@ -446,7 +455,11 @@ namespace OpenSim.Data.MySQL | |||
446 | foreach (SceneObjectPart prim in prims.Values) | 455 | foreach (SceneObjectPart prim in prims.Values) |
447 | { | 456 | { |
448 | if (prim.ParentUUID == UUID.Zero) | 457 | if (prim.ParentUUID == UUID.Zero) |
458 | { | ||
449 | objects[prim.UUID] = new SceneObjectGroup(prim); | 459 | objects[prim.UUID] = new SceneObjectGroup(prim); |
460 | if (prim.KeyframeMotion != null) | ||
461 | prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]); | ||
462 | } | ||
450 | } | 463 | } |
451 | 464 | ||
452 | // Add all of the children objects to the SOGs | 465 | // Add all of the children objects to the SOGs |
@@ -559,36 +572,51 @@ namespace OpenSim.Data.MySQL | |||
559 | } | 572 | } |
560 | } | 573 | } |
561 | 574 | ||
562 | public void StoreTerrain(double[,] ter, UUID regionID) | 575 | public virtual void StoreTerrain(double[,] ter, UUID regionID) |
563 | { | 576 | { |
564 | m_log.Info("[REGION DB]: Storing terrain"); | 577 | Util.FireAndForget(delegate(object x) |
565 | |||
566 | lock (m_dbLock) | ||
567 | { | 578 | { |
568 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | 579 | double[,] oldTerrain = LoadTerrain(regionID); |
569 | { | ||
570 | dbcon.Open(); | ||
571 | 580 | ||
572 | using (MySqlCommand cmd = dbcon.CreateCommand()) | 581 | m_log.Info("[REGION DB]: Storing terrain"); |
582 | |||
583 | lock (m_dbLock) | ||
584 | { | ||
585 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | ||
573 | { | 586 | { |
574 | cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID"; | 587 | dbcon.Open(); |
575 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); | ||
576 | 588 | ||
577 | ExecuteNonQuery(cmd); | 589 | using (MySqlCommand cmd = dbcon.CreateCommand()) |
590 | { | ||
591 | cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID"; | ||
592 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); | ||
578 | 593 | ||
579 | cmd.CommandText = "insert into terrain (RegionUUID, " + | 594 | using (MySqlCommand cmd2 = dbcon.CreateCommand()) |
580 | "Revision, Heightfield) values (?RegionUUID, " + | 595 | { |
581 | "1, ?Heightfield)"; | 596 | try |
597 | { | ||
598 | cmd2.CommandText = "insert into terrain (RegionUUID, " + | ||
599 | "Revision, Heightfield) values (?RegionUUID, " + | ||
600 | "1, ?Heightfield)"; | ||
582 | 601 | ||
583 | cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter)); | 602 | cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString()); |
603 | cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter, oldTerrain)); | ||
584 | 604 | ||
585 | ExecuteNonQuery(cmd); | 605 | ExecuteNonQuery(cmd); |
606 | ExecuteNonQuery(cmd2); | ||
607 | } | ||
608 | catch (Exception e) | ||
609 | { | ||
610 | m_log.ErrorFormat(e.ToString()); | ||
611 | } | ||
612 | } | ||
613 | } | ||
586 | } | 614 | } |
587 | } | 615 | } |
588 | } | 616 | }); |
589 | } | 617 | } |
590 | 618 | ||
591 | public double[,] LoadTerrain(UUID regionID) | 619 | public virtual double[,] LoadTerrain(UUID regionID) |
592 | { | 620 | { |
593 | double[,] terrain = null; | 621 | double[,] terrain = null; |
594 | 622 | ||
@@ -638,7 +666,7 @@ namespace OpenSim.Data.MySQL | |||
638 | return terrain; | 666 | return terrain; |
639 | } | 667 | } |
640 | 668 | ||
641 | public void RemoveLandObject(UUID globalID) | 669 | public virtual void RemoveLandObject(UUID globalID) |
642 | { | 670 | { |
643 | lock (m_dbLock) | 671 | lock (m_dbLock) |
644 | { | 672 | { |
@@ -657,7 +685,7 @@ namespace OpenSim.Data.MySQL | |||
657 | } | 685 | } |
658 | } | 686 | } |
659 | 687 | ||
660 | public void StoreLandObject(ILandObject parcel) | 688 | public virtual void StoreLandObject(ILandObject parcel) |
661 | { | 689 | { |
662 | lock (m_dbLock) | 690 | lock (m_dbLock) |
663 | { | 691 | { |
@@ -714,7 +742,7 @@ namespace OpenSim.Data.MySQL | |||
714 | } | 742 | } |
715 | } | 743 | } |
716 | 744 | ||
717 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | 745 | public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) |
718 | { | 746 | { |
719 | RegionLightShareData nWP = new RegionLightShareData(); | 747 | RegionLightShareData nWP = new RegionLightShareData(); |
720 | nWP.OnSave += StoreRegionWindlightSettings; | 748 | nWP.OnSave += StoreRegionWindlightSettings; |
@@ -738,7 +766,7 @@ namespace OpenSim.Data.MySQL | |||
738 | { | 766 | { |
739 | //No result, so store our default windlight profile and return it | 767 | //No result, so store our default windlight profile and return it |
740 | nWP.regionID = regionUUID; | 768 | nWP.regionID = regionUUID; |
741 | StoreRegionWindlightSettings(nWP); | 769 | // StoreRegionWindlightSettings(nWP); |
742 | return nWP; | 770 | return nWP; |
743 | } | 771 | } |
744 | else | 772 | else |
@@ -815,7 +843,7 @@ namespace OpenSim.Data.MySQL | |||
815 | return nWP; | 843 | return nWP; |
816 | } | 844 | } |
817 | 845 | ||
818 | public RegionSettings LoadRegionSettings(UUID regionUUID) | 846 | public virtual RegionSettings LoadRegionSettings(UUID regionUUID) |
819 | { | 847 | { |
820 | RegionSettings rs = null; | 848 | RegionSettings rs = null; |
821 | 849 | ||
@@ -855,7 +883,7 @@ namespace OpenSim.Data.MySQL | |||
855 | return rs; | 883 | return rs; |
856 | } | 884 | } |
857 | 885 | ||
858 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | 886 | public virtual void StoreRegionWindlightSettings(RegionLightShareData wl) |
859 | { | 887 | { |
860 | lock (m_dbLock) | 888 | lock (m_dbLock) |
861 | { | 889 | { |
@@ -961,7 +989,7 @@ namespace OpenSim.Data.MySQL | |||
961 | } | 989 | } |
962 | } | 990 | } |
963 | 991 | ||
964 | public void RemoveRegionWindlightSettings(UUID regionID) | 992 | public virtual void RemoveRegionWindlightSettings(UUID regionID) |
965 | { | 993 | { |
966 | lock (m_dbLock) | 994 | lock (m_dbLock) |
967 | { | 995 | { |
@@ -1050,7 +1078,7 @@ namespace OpenSim.Data.MySQL | |||
1050 | } | 1078 | } |
1051 | #endregion | 1079 | #endregion |
1052 | 1080 | ||
1053 | public void StoreRegionSettings(RegionSettings rs) | 1081 | public virtual void StoreRegionSettings(RegionSettings rs) |
1054 | { | 1082 | { |
1055 | lock (m_dbLock) | 1083 | lock (m_dbLock) |
1056 | { | 1084 | { |
@@ -1077,7 +1105,7 @@ namespace OpenSim.Data.MySQL | |||
1077 | "use_estate_sun, fixed_sun, sun_position, " + | 1105 | "use_estate_sun, fixed_sun, sun_position, " + |
1078 | "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + | 1106 | "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + |
1079 | "sunvectorz, loaded_creation_datetime, " + | 1107 | "sunvectorz, loaded_creation_datetime, " + |
1080 | "loaded_creation_id, map_tile_ID, " + | 1108 | "loaded_creation_id, map_tile_ID, block_search, casino, " + |
1081 | "TelehubObject, parcel_tile_ID) " + | 1109 | "TelehubObject, parcel_tile_ID) " + |
1082 | "values (?RegionUUID, ?BlockTerraform, " + | 1110 | "values (?RegionUUID, ?BlockTerraform, " + |
1083 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + | 1111 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + |
@@ -1094,7 +1122,8 @@ namespace OpenSim.Data.MySQL | |||
1094 | "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + | 1122 | "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + |
1095 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | 1123 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + |
1096 | "?LoadedCreationDateTime, ?LoadedCreationID, " + | 1124 | "?LoadedCreationDateTime, ?LoadedCreationID, " + |
1097 | "?TerrainImageID, ?TelehubObject, ?ParcelImageID) "; | 1125 | "?TerrainImageID, ?block_search, ?casino, " + |
1126 | "?TelehubObject, ?ParcelImageID)"; | ||
1098 | 1127 | ||
1099 | FillRegionSettingsCommand(cmd, rs); | 1128 | FillRegionSettingsCommand(cmd, rs); |
1100 | 1129 | ||
@@ -1105,7 +1134,7 @@ namespace OpenSim.Data.MySQL | |||
1105 | SaveSpawnPoints(rs); | 1134 | SaveSpawnPoints(rs); |
1106 | } | 1135 | } |
1107 | 1136 | ||
1108 | public List<LandData> LoadLandObjects(UUID regionUUID) | 1137 | public virtual List<LandData> LoadLandObjects(UUID regionUUID) |
1109 | { | 1138 | { |
1110 | List<LandData> landData = new List<LandData>(); | 1139 | List<LandData> landData = new List<LandData>(); |
1111 | 1140 | ||
@@ -1287,11 +1316,40 @@ namespace OpenSim.Data.MySQL | |||
1287 | prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"]; | 1316 | prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"]; |
1288 | 1317 | ||
1289 | prim.PassTouches = ((sbyte)row["PassTouches"] != 0); | 1318 | prim.PassTouches = ((sbyte)row["PassTouches"] != 0); |
1319 | prim.PassCollisions = ((sbyte)row["PassCollisions"] != 0); | ||
1290 | prim.LinkNum = (int)row["LinkNumber"]; | 1320 | prim.LinkNum = (int)row["LinkNumber"]; |
1291 | 1321 | ||
1292 | if (!(row["MediaURL"] is System.DBNull)) | 1322 | if (!(row["MediaURL"] is System.DBNull)) |
1293 | prim.MediaUrl = (string)row["MediaURL"]; | 1323 | prim.MediaUrl = (string)row["MediaURL"]; |
1294 | 1324 | ||
1325 | if (!(row["KeyframeMotion"] is DBNull)) | ||
1326 | { | ||
1327 | Byte[] data = (byte[])row["KeyframeMotion"]; | ||
1328 | if (data.Length > 0) | ||
1329 | prim.KeyframeMotion = KeyframeMotion.FromData(null, data); | ||
1330 | else | ||
1331 | prim.KeyframeMotion = null; | ||
1332 | } | ||
1333 | else | ||
1334 | { | ||
1335 | prim.KeyframeMotion = null; | ||
1336 | } | ||
1337 | |||
1338 | prim.PhysicsShapeType = (byte)Convert.ToInt32(row["PhysicsShapeType"].ToString()); | ||
1339 | prim.Density = (float)(double)row["Density"]; | ||
1340 | prim.GravityModifier = (float)(double)row["GravityModifier"]; | ||
1341 | prim.Friction = (float)(double)row["Friction"]; | ||
1342 | prim.Bounciness = (float)(double)row["Restitution"]; | ||
1343 | |||
1344 | SOPVehicle vehicle = null; | ||
1345 | |||
1346 | if (row["Vehicle"].ToString() != String.Empty) | ||
1347 | { | ||
1348 | vehicle = SOPVehicle.FromXml2(row["Vehicle"].ToString()); | ||
1349 | if (vehicle != null) | ||
1350 | prim.VehicleParams = vehicle; | ||
1351 | } | ||
1352 | |||
1295 | return prim; | 1353 | return prim; |
1296 | } | 1354 | } |
1297 | 1355 | ||
@@ -1302,32 +1360,40 @@ namespace OpenSim.Data.MySQL | |||
1302 | /// <returns></returns> | 1360 | /// <returns></returns> |
1303 | private static TaskInventoryItem BuildItem(IDataReader row) | 1361 | private static TaskInventoryItem BuildItem(IDataReader row) |
1304 | { | 1362 | { |
1305 | TaskInventoryItem taskItem = new TaskInventoryItem(); | 1363 | try |
1306 | 1364 | { | |
1307 | taskItem.ItemID = DBGuid.FromDB(row["itemID"]); | 1365 | TaskInventoryItem taskItem = new TaskInventoryItem(); |
1308 | taskItem.ParentPartID = DBGuid.FromDB(row["primID"]); | 1366 | |
1309 | taskItem.AssetID = DBGuid.FromDB(row["assetID"]); | 1367 | taskItem.ItemID = DBGuid.FromDB(row["itemID"]); |
1310 | taskItem.ParentID = DBGuid.FromDB(row["parentFolderID"]); | 1368 | taskItem.ParentPartID = DBGuid.FromDB(row["primID"]); |
1311 | 1369 | taskItem.AssetID = DBGuid.FromDB(row["assetID"]); | |
1312 | taskItem.InvType = Convert.ToInt32(row["invType"]); | 1370 | taskItem.ParentID = DBGuid.FromDB(row["parentFolderID"]); |
1313 | taskItem.Type = Convert.ToInt32(row["assetType"]); | 1371 | |
1314 | 1372 | taskItem.InvType = Convert.ToInt32(row["invType"]); | |
1315 | taskItem.Name = (String)row["name"]; | 1373 | taskItem.Type = Convert.ToInt32(row["assetType"]); |
1316 | taskItem.Description = (String)row["description"]; | 1374 | |
1317 | taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); | 1375 | taskItem.Name = (String)row["name"]; |
1318 | taskItem.CreatorIdentification = (String)row["creatorID"]; | 1376 | taskItem.Description = (String)row["description"]; |
1319 | taskItem.OwnerID = DBGuid.FromDB(row["ownerID"]); | 1377 | taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); |
1320 | taskItem.LastOwnerID = DBGuid.FromDB(row["lastOwnerID"]); | 1378 | taskItem.CreatorIdentification = (String)row["creatorID"]; |
1321 | taskItem.GroupID = DBGuid.FromDB(row["groupID"]); | 1379 | taskItem.OwnerID = DBGuid.FromDB(row["ownerID"]); |
1322 | 1380 | taskItem.LastOwnerID = DBGuid.FromDB(row["lastOwnerID"]); | |
1323 | taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); | 1381 | taskItem.GroupID = DBGuid.FromDB(row["groupID"]); |
1324 | taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); | 1382 | |
1325 | taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]); | 1383 | taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); |
1326 | taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]); | 1384 | taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); |
1327 | taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]); | 1385 | taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]); |
1328 | taskItem.Flags = Convert.ToUInt32(row["flags"]); | 1386 | taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]); |
1329 | 1387 | taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]); | |
1330 | return taskItem; | 1388 | taskItem.Flags = Convert.ToUInt32(row["flags"]); |
1389 | |||
1390 | return taskItem; | ||
1391 | } | ||
1392 | catch | ||
1393 | { | ||
1394 | m_log.ErrorFormat("[MYSQL DB]: Error reading task inventory: itemID was {0}, primID was {1}", row["itemID"].ToString(), row["primID"].ToString()); | ||
1395 | throw; | ||
1396 | } | ||
1331 | } | 1397 | } |
1332 | 1398 | ||
1333 | private static RegionSettings BuildRegionSettings(IDataReader row) | 1399 | private static RegionSettings BuildRegionSettings(IDataReader row) |
@@ -1385,6 +1451,9 @@ namespace OpenSim.Data.MySQL | |||
1385 | newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]); | 1451 | newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]); |
1386 | newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]); | 1452 | newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]); |
1387 | 1453 | ||
1454 | newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]); | ||
1455 | newSettings.Casino = Convert.ToBoolean(row["casino"]); | ||
1456 | |||
1388 | return newSettings; | 1457 | return newSettings; |
1389 | } | 1458 | } |
1390 | 1459 | ||
@@ -1482,7 +1551,7 @@ namespace OpenSim.Data.MySQL | |||
1482 | /// </summary> | 1551 | /// </summary> |
1483 | /// <param name="val"></param> | 1552 | /// <param name="val"></param> |
1484 | /// <returns></returns> | 1553 | /// <returns></returns> |
1485 | private static Array SerializeTerrain(double[,] val) | 1554 | private static Array SerializeTerrain(double[,] val, double[,] oldTerrain) |
1486 | { | 1555 | { |
1487 | MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double)); | 1556 | MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double)); |
1488 | BinaryWriter bw = new BinaryWriter(str); | 1557 | BinaryWriter bw = new BinaryWriter(str); |
@@ -1491,7 +1560,11 @@ namespace OpenSim.Data.MySQL | |||
1491 | for (int x = 0; x < (int)Constants.RegionSize; x++) | 1560 | for (int x = 0; x < (int)Constants.RegionSize; x++) |
1492 | for (int y = 0; y < (int)Constants.RegionSize; y++) | 1561 | for (int y = 0; y < (int)Constants.RegionSize; y++) |
1493 | { | 1562 | { |
1494 | double height = val[x, y]; | 1563 | double height = 20.0; |
1564 | if (oldTerrain != null) | ||
1565 | height = oldTerrain[x, y]; | ||
1566 | if (!double.IsNaN(val[x, y])) | ||
1567 | height = val[x, y]; | ||
1495 | if (height == 0.0) | 1568 | if (height == 0.0) |
1496 | height = double.Epsilon; | 1569 | height = double.Epsilon; |
1497 | 1570 | ||
@@ -1635,8 +1708,29 @@ namespace OpenSim.Data.MySQL | |||
1635 | else | 1708 | else |
1636 | cmd.Parameters.AddWithValue("PassTouches", 0); | 1709 | cmd.Parameters.AddWithValue("PassTouches", 0); |
1637 | 1710 | ||
1711 | if (prim.PassCollisions) | ||
1712 | cmd.Parameters.AddWithValue("PassCollisions", 1); | ||
1713 | else | ||
1714 | cmd.Parameters.AddWithValue("PassCollisions", 0); | ||
1715 | |||
1638 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1716 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
1639 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | 1717 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); |
1718 | |||
1719 | if (prim.KeyframeMotion != null) | ||
1720 | cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize()); | ||
1721 | else | ||
1722 | cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]); | ||
1723 | |||
1724 | cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType); | ||
1725 | cmd.Parameters.AddWithValue("Density", (double)prim.Density); | ||
1726 | cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier); | ||
1727 | cmd.Parameters.AddWithValue("Friction", (double)prim.Friction); | ||
1728 | cmd.Parameters.AddWithValue("Restitution", (double)prim.Bounciness); | ||
1729 | |||
1730 | if (prim.VehicleParams != null) | ||
1731 | cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2()); | ||
1732 | else | ||
1733 | cmd.Parameters.AddWithValue("Vehicle", String.Empty); | ||
1640 | } | 1734 | } |
1641 | 1735 | ||
1642 | /// <summary> | 1736 | /// <summary> |
@@ -1715,6 +1809,9 @@ namespace OpenSim.Data.MySQL | |||
1715 | cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); | 1809 | cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); |
1716 | cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); | 1810 | cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); |
1717 | cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); | 1811 | cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID); |
1812 | cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch); | ||
1813 | cmd.Parameters.AddWithValue("casino", settings.Casino); | ||
1814 | |||
1718 | cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID); | 1815 | cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID); |
1719 | cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject); | 1816 | cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject); |
1720 | } | 1817 | } |
@@ -1875,7 +1972,7 @@ namespace OpenSim.Data.MySQL | |||
1875 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); | 1972 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); |
1876 | } | 1973 | } |
1877 | 1974 | ||
1878 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) | 1975 | public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) |
1879 | { | 1976 | { |
1880 | lock (m_dbLock) | 1977 | lock (m_dbLock) |
1881 | { | 1978 | { |
@@ -1919,6 +2016,37 @@ namespace OpenSim.Data.MySQL | |||
1919 | } | 2016 | } |
1920 | } | 2017 | } |
1921 | 2018 | ||
2019 | public UUID[] GetObjectIDs(UUID regionID) | ||
2020 | { | ||
2021 | List<UUID> uuids = new List<UUID>(); | ||
2022 | |||
2023 | lock (m_dbLock) | ||
2024 | { | ||
2025 | using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) | ||
2026 | { | ||
2027 | dbcon.Open(); | ||
2028 | |||
2029 | using (MySqlCommand cmd = dbcon.CreateCommand()) | ||
2030 | { | ||
2031 | cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID"; | ||
2032 | cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); | ||
2033 | |||
2034 | using (IDataReader reader = ExecuteReader(cmd)) | ||
2035 | { | ||
2036 | while (reader.Read()) | ||
2037 | { | ||
2038 | UUID id = new UUID(reader["UUID"].ToString()); | ||
2039 | |||
2040 | uuids.Add(id); | ||
2041 | } | ||
2042 | } | ||
2043 | } | ||
2044 | } | ||
2045 | } | ||
2046 | |||
2047 | return uuids.ToArray(); | ||
2048 | } | ||
2049 | |||
1922 | private void LoadSpawnPoints(RegionSettings rs) | 2050 | private void LoadSpawnPoints(RegionSettings rs) |
1923 | { | 2051 | { |
1924 | rs.ClearSpawnPoints(); | 2052 | rs.ClearSpawnPoints(); |
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs index e964295..4ff3175 100644 --- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs +++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs | |||
@@ -46,17 +46,21 @@ namespace OpenSim.Data.MySQL | |||
46 | { | 46 | { |
47 | string[] words = query.Split(new char[] {' '}); | 47 | string[] words = query.Split(new char[] {' '}); |
48 | 48 | ||
49 | bool valid = false; | ||
50 | |||
49 | for (int i = 0 ; i < words.Length ; i++) | 51 | for (int i = 0 ; i < words.Length ; i++) |
50 | { | 52 | { |
51 | if (words[i].Length < 3) | 53 | if (words[i].Length > 2) |
52 | { | 54 | valid = true; |
53 | if (i != words.Length - 1) | 55 | // if (words[i].Length < 3) |
54 | Array.Copy(words, i + 1, words, i, words.Length - i - 1); | 56 | // { |
55 | Array.Resize(ref words, words.Length - 1); | 57 | // if (i != words.Length - 1) |
56 | } | 58 | // Array.Copy(words, i + 1, words, i, words.Length - i - 1); |
59 | // Array.Resize(ref words, words.Length - 1); | ||
60 | // } | ||
57 | } | 61 | } |
58 | 62 | ||
59 | if (words.Length == 0) | 63 | if ((!valid) || words.Length == 0) |
60 | return new UserAccountData[0]; | 64 | return new UserAccountData[0]; |
61 | 65 | ||
62 | if (words.Length > 2) | 66 | if (words.Length > 2) |
@@ -66,20 +70,36 @@ namespace OpenSim.Data.MySQL | |||
66 | { | 70 | { |
67 | if (words.Length == 1) | 71 | if (words.Length == 1) |
68 | { | 72 | { |
69 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm); | 73 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm); |
70 | cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%"); | 74 | cmd.Parameters.AddWithValue("?search", words[0] + "%"); |
71 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); | 75 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); |
72 | } | 76 | } |
73 | else | 77 | else |
74 | { | 78 | { |
75 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm); | 79 | cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm); |
76 | cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%"); | 80 | cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%"); |
77 | cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%"); | 81 | cmd.Parameters.AddWithValue("?searchLast", words[1] + "%"); |
78 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); | 82 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); |
79 | } | 83 | } |
80 | 84 | ||
81 | return DoQuery(cmd); | 85 | return DoQuery(cmd); |
82 | } | 86 | } |
83 | } | 87 | } |
88 | |||
89 | public UserAccountData[] GetUsersWhere(UUID scopeID, string where) | ||
90 | { | ||
91 | using (MySqlCommand cmd = new MySqlCommand()) | ||
92 | { | ||
93 | if (scopeID != UUID.Zero) | ||
94 | { | ||
95 | where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")"; | ||
96 | cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString()); | ||
97 | } | ||
98 | |||
99 | cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm); | ||
100 | |||
101 | return DoQuery(cmd); | ||
102 | } | ||
103 | } | ||
84 | } | 104 | } |
85 | } \ No newline at end of file | 105 | } |
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index e6ac22e..9a50373 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
@@ -497,4 +497,4 @@ namespace OpenSim.Data.MySQL | |||
497 | 497 | ||
498 | #endregion | 498 | #endregion |
499 | } | 499 | } |
500 | } \ No newline at end of file | 500 | } |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 5b59779..c4b0832 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -717,7 +717,7 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT | |||
717 | 717 | ||
718 | COMMIT; | 718 | COMMIT; |
719 | 719 | ||
720 | :VERSION 32 | 720 | :VERSION 32 #--------------------- |
721 | 721 | ||
722 | BEGIN; | 722 | BEGIN; |
723 | CREATE TABLE `regionwindlight` ( | 723 | CREATE TABLE `regionwindlight` ( |
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index 4979cf6..e7e5c41 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
@@ -152,6 +152,11 @@ namespace OpenSim.Data.Null | |||
152 | { | 152 | { |
153 | } | 153 | } |
154 | 154 | ||
155 | public UUID[] GetObjectIDs(UUID regionID) | ||
156 | { | ||
157 | return new UUID[0]; | ||
158 | } | ||
159 | |||
155 | public void SaveExtra(UUID regionID, string name, string value) | 160 | public void SaveExtra(UUID regionID, string name, string value) |
156 | { | 161 | { |
157 | } | 162 | } |
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs index ec54dba..241616b 100644 --- a/OpenSim/Data/Null/NullUserAccountData.cs +++ b/OpenSim/Data/Null/NullUserAccountData.cs | |||
@@ -193,5 +193,10 @@ namespace OpenSim.Data.Null | |||
193 | 193 | ||
194 | return false; | 194 | return false; |
195 | } | 195 | } |
196 | |||
197 | public UserAccountData[] GetUsersWhere(UUID scopeID, string where) | ||
198 | { | ||
199 | return null; | ||
200 | } | ||
196 | } | 201 | } |
197 | } | 202 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index d0e24c3..7f7059b 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Data.SQLite | |||
131 | /// Create an asset | 131 | /// Create an asset |
132 | /// </summary> | 132 | /// </summary> |
133 | /// <param name="asset">Asset Base</param> | 133 | /// <param name="asset">Asset Base</param> |
134 | override public void StoreAsset(AssetBase asset) | 134 | override public bool StoreAsset(AssetBase asset) |
135 | { | 135 | { |
136 | //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); | 136 | //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); |
137 | if (ExistsAsset(asset.FullID)) | 137 | if (ExistsAsset(asset.FullID)) |
@@ -153,6 +153,7 @@ namespace OpenSim.Data.SQLite | |||
153 | cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); | 153 | cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); |
154 | 154 | ||
155 | cmd.ExecuteNonQuery(); | 155 | cmd.ExecuteNonQuery(); |
156 | return true; | ||
156 | } | 157 | } |
157 | } | 158 | } |
158 | } | 159 | } |
@@ -173,6 +174,7 @@ namespace OpenSim.Data.SQLite | |||
173 | cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); | 174 | cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); |
174 | 175 | ||
175 | cmd.ExecuteNonQuery(); | 176 | cmd.ExecuteNonQuery(); |
177 | return true; | ||
176 | } | 178 | } |
177 | } | 179 | } |
178 | } | 180 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 29cac3c..42cd59d 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -2905,6 +2905,11 @@ namespace OpenSim.Data.SQLite | |||
2905 | } | 2905 | } |
2906 | } | 2906 | } |
2907 | 2907 | ||
2908 | public UUID[] GetObjectIDs(UUID regionID) | ||
2909 | { | ||
2910 | return new UUID[0]; | ||
2911 | } | ||
2912 | |||
2908 | public void SaveExtra(UUID regionID, string name, string value) | 2913 | public void SaveExtra(UUID regionID, string name, string value) |
2909 | { | 2914 | { |
2910 | } | 2915 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs index 7a5de50..4d580c0 100644 --- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs | |||
@@ -81,5 +81,10 @@ namespace OpenSim.Data.SQLite | |||
81 | 81 | ||
82 | return DoQuery(cmd); | 82 | return DoQuery(cmd); |
83 | } | 83 | } |
84 | |||
85 | public UserAccountData[] GetUsersWhere(UUID scopeID, string where) | ||
86 | { | ||
87 | return null; | ||
88 | } | ||
84 | } | 89 | } |
85 | } | 90 | } |