aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Storage
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Storage')
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs84
1 files changed, 37 insertions, 47 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 65b03ad..6971cc8 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -1,25 +1,15 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text;
4using System.Xml;
5using System.Xml.Serialization;
6using System.IO;
7
8using OpenSim.Region.Environment.Scenes;
9using OpenSim.Region.Environment.LandManagement;
10using OpenSim.Region.Environment;
11using OpenSim.Region.Environment.Interfaces;
12using OpenSim.Framework.Console;
13using OpenSim.Framework.Types;
14using OpenSim.Framework.Utilities;
15using libsecondlife;
16
17using System.Data; 3using System.Data;
18using System.Data.SqlTypes; 4using libsecondlife;
19
20using Mono.Data.SqliteClient; 5using Mono.Data.SqliteClient;
6using OpenSim.Framework.Console;
7using OpenSim.Framework.Types;
8using OpenSim.Region.Environment.Interfaces;
9using OpenSim.Region.Environment.LandManagement;
10using OpenSim.Region.Environment.Scenes;
21 11
22namespace OpenSim.DataStore.MonoSqliteStorage 12namespace OpenSim.DataStore.MonoSqlite
23{ 13{
24 public class MonoSqliteDataStore : IRegionDataStore 14 public class MonoSqliteDataStore : IRegionDataStore
25 { 15 {
@@ -402,37 +392,37 @@ namespace OpenSim.DataStore.MonoSqliteStorage
402 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); 392 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
403 // vectors 393 // vectors
404 prim.OffsetPosition = new LLVector3( 394 prim.OffsetPosition = new LLVector3(
405 Convert.ToSingle(row["PositionX"]), 395 Convert.ToSingle(row["PositionX"]),
406 Convert.ToSingle(row["PositionY"]), 396 Convert.ToSingle(row["PositionY"]),
407 Convert.ToSingle(row["PositionZ"]) 397 Convert.ToSingle(row["PositionZ"])
408 ); 398 );
409 prim.GroupPosition = new LLVector3( 399 prim.GroupPosition = new LLVector3(
410 Convert.ToSingle(row["GroupPositionX"]), 400 Convert.ToSingle(row["GroupPositionX"]),
411 Convert.ToSingle(row["GroupPositionY"]), 401 Convert.ToSingle(row["GroupPositionY"]),
412 Convert.ToSingle(row["GroupPositionZ"]) 402 Convert.ToSingle(row["GroupPositionZ"])
413 ); 403 );
414 prim.Velocity = new LLVector3( 404 prim.Velocity = new LLVector3(
415 Convert.ToSingle(row["VelocityX"]), 405 Convert.ToSingle(row["VelocityX"]),
416 Convert.ToSingle(row["VelocityY"]), 406 Convert.ToSingle(row["VelocityY"]),
417 Convert.ToSingle(row["VelocityZ"]) 407 Convert.ToSingle(row["VelocityZ"])
418 ); 408 );
419 prim.AngularVelocity = new LLVector3( 409 prim.AngularVelocity = new LLVector3(
420 Convert.ToSingle(row["AngularVelocityX"]), 410 Convert.ToSingle(row["AngularVelocityX"]),
421 Convert.ToSingle(row["AngularVelocityY"]), 411 Convert.ToSingle(row["AngularVelocityY"]),
422 Convert.ToSingle(row["AngularVelocityZ"]) 412 Convert.ToSingle(row["AngularVelocityZ"])
423 ); 413 );
424 prim.Acceleration = new LLVector3( 414 prim.Acceleration = new LLVector3(
425 Convert.ToSingle(row["AccelerationX"]), 415 Convert.ToSingle(row["AccelerationX"]),
426 Convert.ToSingle(row["AccelerationY"]), 416 Convert.ToSingle(row["AccelerationY"]),
427 Convert.ToSingle(row["AccelerationZ"]) 417 Convert.ToSingle(row["AccelerationZ"])
428 ); 418 );
429 // quaternions 419 // quaternions
430 prim.RotationOffset = new LLQuaternion( 420 prim.RotationOffset = new LLQuaternion(
431 Convert.ToSingle(row["RotationX"]), 421 Convert.ToSingle(row["RotationX"]),
432 Convert.ToSingle(row["RotationY"]), 422 Convert.ToSingle(row["RotationY"]),
433 Convert.ToSingle(row["RotationZ"]), 423 Convert.ToSingle(row["RotationZ"]),
434 Convert.ToSingle(row["RotationW"]) 424 Convert.ToSingle(row["RotationW"])
435 ); 425 );
436 426
437 return prim; 427 return prim;
438 } 428 }
@@ -488,10 +478,10 @@ namespace OpenSim.DataStore.MonoSqliteStorage
488 { 478 {
489 PrimitiveBaseShape s = new PrimitiveBaseShape(); 479 PrimitiveBaseShape s = new PrimitiveBaseShape();
490 s.Scale = new LLVector3( 480 s.Scale = new LLVector3(
491 Convert.ToSingle(row["ScaleX"]), 481 Convert.ToSingle(row["ScaleX"]),
492 Convert.ToSingle(row["ScaleY"]), 482 Convert.ToSingle(row["ScaleY"]),
493 Convert.ToSingle(row["ScaleZ"]) 483 Convert.ToSingle(row["ScaleZ"])
494 ); 484 );
495 // paths 485 // paths
496 s.PCode = Convert.ToByte(row["PCode"]); 486 s.PCode = Convert.ToByte(row["PCode"]);
497 s.PathBegin = Convert.ToUInt16(row["PathBegin"]); 487 s.PathBegin = Convert.ToUInt16(row["PathBegin"]);
@@ -876,4 +866,4 @@ namespace OpenSim.DataStore.MonoSqliteStorage
876 } 866 }
877 } 867 }
878 } 868 }
879} 869} \ No newline at end of file