1 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 8db5d7d..6dfcb3c 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -557,18 +557,19 @@ namespace OpenSim.DataStore.MSSQL
            try
            {
-                prim.SetSitTargetLL(new LLVector3(
+                prim.SitTargetPositionLL = new LLVector3(
-                                        Convert.ToSingle(row["SitTargetOffsetX"]),
+                                                         Convert.ToSingle(row["SitTargetOffsetX"]),
-                                        Convert.ToSingle(row["SitTargetOffsetY"]),
+                                                         Convert.ToSingle(row["SitTargetOffsetY"]),
-                                        Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion(
+                                                         Convert.ToSingle(row["SitTargetOffsetZ"]));
-                                                                                        Convert.ToSingle(
+                prim.SitTargetOrientationLL = new LLQuaternion(
-                                                                                            row["SitTargetOrientX"]),
+                                                               Convert.ToSingle(
-                                                                                        Convert.ToSingle(
+                                                                                row["SitTargetOrientX"]),
-                                                                                            row["SitTargetOrientY"]),
+                                                               Convert.ToSingle(
-                                                                                        Convert.ToSingle(
+                                                                                row["SitTargetOrientY"]),
-                                                                                            row["SitTargetOrientZ"]),
+                                                               Convert.ToSingle(
-                                                                                        Convert.ToSingle(
+                                                                                row["SitTargetOrientZ"]),
-                                                                                            row["SitTargetOrientW"])));
+                                                               Convert.ToSingle(
+                                                                                row["SitTargetOrientW"]));
            }
            catch (InvalidCastException)
            {
@@ -628,12 +629,12 @@ namespace OpenSim.DataStore.MSSQL
            try
            {
                // Sit target
-                LLVector3 sitTargetPos = prim.GetSitTargetPositionLL();
+                LLVector3 sitTargetPos = prim.SitTargetPositionLL;
                row["SitTargetOffsetX"] = sitTargetPos.X;
                row["SitTargetOffsetY"] = sitTargetPos.Y;
                row["SitTargetOffsetZ"] = sitTargetPos.Z;
-                LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL();
+                LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
                row["SitTargetOrientW"] = sitTargetOrient.W;
                row["SitTargetOrientX"] = sitTargetOrient.X;
                row["SitTargetOrientY"] = sitTargetOrient.Y;

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index 8db5d7d..6dfcb3c 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -557,18 +557,19 @@ namespace OpenSim.DataStore.MSSQL
557		557
558	try	558	try
559	{	559	{
560	prim.SetSitTargetLL(new LLVector3(	560	prim.SitTargetPositionLL = new LLVector3(
561	Convert.ToSingle(row["SitTargetOffsetX"]),	561	Convert.ToSingle(row["SitTargetOffsetX"]),
562	Convert.ToSingle(row["SitTargetOffsetY"]),	562	Convert.ToSingle(row["SitTargetOffsetY"]),
563	Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion(	563	Convert.ToSingle(row["SitTargetOffsetZ"]));
564	Convert.ToSingle(	564	prim.SitTargetOrientationLL = new LLQuaternion(
565	row["SitTargetOrientX"]),	565	Convert.ToSingle(
566	Convert.ToSingle(	566	row["SitTargetOrientX"]),
567	row["SitTargetOrientY"]),	567	Convert.ToSingle(
568	Convert.ToSingle(	568	row["SitTargetOrientY"]),
569	row["SitTargetOrientZ"]),	569	Convert.ToSingle(
570	Convert.ToSingle(	570	row["SitTargetOrientZ"]),
571	row["SitTargetOrientW"])));	571	Convert.ToSingle(
		572	row["SitTargetOrientW"]));
572	}	573	}
573	catch (InvalidCastException)	574	catch (InvalidCastException)
574	{	575	{
@@ -628,12 +629,12 @@ namespace OpenSim.DataStore.MSSQL
628	try	629	try
629	{	630	{
630	// Sit target	631	// Sit target
631	LLVector3 sitTargetPos = prim.GetSitTargetPositionLL();	632	LLVector3 sitTargetPos = prim.SitTargetPositionLL;
632	row["SitTargetOffsetX"] = sitTargetPos.X;	633	row["SitTargetOffsetX"] = sitTargetPos.X;
633	row["SitTargetOffsetY"] = sitTargetPos.Y;	634	row["SitTargetOffsetY"] = sitTargetPos.Y;
634	row["SitTargetOffsetZ"] = sitTargetPos.Z;	635	row["SitTargetOffsetZ"] = sitTargetPos.Z;
635		636
636	LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL();	637	LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
637	row["SitTargetOrientW"] = sitTargetOrient.W;	638	row["SitTargetOrientW"] = sitTargetOrient.W;
638	row["SitTargetOrientX"] = sitTargetOrient.X;	639	row["SitTargetOrientX"] = sitTargetOrient.X;
639	row["SitTargetOrientY"] = sitTargetOrient.Y;	640	row["SitTargetOrientY"] = sitTargetOrient.Y;