1 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index effee9b..0e67fb9 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -992,18 +992,19 @@ namespace OpenSim.Data.SQLite
            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)
            {
@@ -1334,12 +1335,12 @@ namespace OpenSim.Data.SQLite
            row["RotationW"] = prim.RotationOffset.W;
            // 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/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index effee9b..0e67fb9 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -992,18 +992,19 @@ namespace OpenSim.Data.SQLite
992		992
993	try	993	try
994	{	994	{
995	prim.SetSitTargetLL(new LLVector3(	995	prim.SitTargetPositionLL = new LLVector3(
996	Convert.ToSingle(row["SitTargetOffsetX"]),	996	Convert.ToSingle(row["SitTargetOffsetX"]),
997	Convert.ToSingle(row["SitTargetOffsetY"]),	997	Convert.ToSingle(row["SitTargetOffsetY"]),
998	Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion(	998	Convert.ToSingle(row["SitTargetOffsetZ"]));
999	Convert.ToSingle(	999	prim.SitTargetOrientationLL = new LLQuaternion(
1000	row["SitTargetOrientX"]),	1000	Convert.ToSingle(
1001	Convert.ToSingle(	1001	row["SitTargetOrientX"]),
1002	row["SitTargetOrientY"]),	1002	Convert.ToSingle(
1003	Convert.ToSingle(	1003	row["SitTargetOrientY"]),
1004	row["SitTargetOrientZ"]),	1004	Convert.ToSingle(
1005	Convert.ToSingle(	1005	row["SitTargetOrientZ"]),
1006	row["SitTargetOrientW"])));	1006	Convert.ToSingle(
		1007	row["SitTargetOrientW"]));
1007	}	1008	}
1008	catch (InvalidCastException)	1009	catch (InvalidCastException)
1009	{	1010	{
@@ -1334,12 +1335,12 @@ namespace OpenSim.Data.SQLite
1334	row["RotationW"] = prim.RotationOffset.W;	1335	row["RotationW"] = prim.RotationOffset.W;
1335		1336
1336	// Sit target	1337	// Sit target
1337	LLVector3 sitTargetPos = prim.GetSitTargetPositionLL();	1338	LLVector3 sitTargetPos = prim.SitTargetPositionLL;
1338	row["SitTargetOffsetX"] = sitTargetPos.X;	1339	row["SitTargetOffsetX"] = sitTargetPos.X;
1339	row["SitTargetOffsetY"] = sitTargetPos.Y;	1340	row["SitTargetOffsetY"] = sitTargetPos.Y;
1340	row["SitTargetOffsetZ"] = sitTargetPos.Z;	1341	row["SitTargetOffsetZ"] = sitTargetPos.Z;
1341		1342
1342	LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL();	1343	LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
1343	row["SitTargetOrientW"] = sitTargetOrient.W;	1344	row["SitTargetOrientW"] = sitTargetOrient.W;
1344	row["SitTargetOrientX"] = sitTargetOrient.X;	1345	row["SitTargetOrientX"] = sitTargetOrient.X;
1345	row["SitTargetOrientY"] = sitTargetOrient.Y;	1346	row["SitTargetOrientY"] = sitTargetOrient.Y;