1 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 7dc5b0c..254e526 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1314,18 +1314,19 @@ namespace OpenSim.Data.MySQL
                );
            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)
            {
@@ -1584,12 +1585,12 @@ namespace OpenSim.Data.MySQL
            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/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index 7dc5b0c..254e526 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1314,18 +1314,19 @@ namespace OpenSim.Data.MySQL
1314	);	1314	);
1315	try	1315	try
1316	{	1316	{
1317	prim.SetSitTargetLL(new LLVector3(	1317	prim.SitTargetPositionLL = new LLVector3(
1318	Convert.ToSingle(row["SitTargetOffsetX"]),	1318	Convert.ToSingle(row["SitTargetOffsetX"]),
1319	Convert.ToSingle(row["SitTargetOffsetY"]),	1319	Convert.ToSingle(row["SitTargetOffsetY"]),
1320	Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion(	1320	Convert.ToSingle(row["SitTargetOffsetZ"]));
1321	Convert.ToSingle(	1321	prim.SitTargetOrientationLL = new LLQuaternion(
1322	row["SitTargetOrientX"]),	1322	Convert.ToSingle(
1323	Convert.ToSingle(	1323	row["SitTargetOrientX"]),
1324	row["SitTargetOrientY"]),	1324	Convert.ToSingle(
1325	Convert.ToSingle(	1325	row["SitTargetOrientY"]),
1326	row["SitTargetOrientZ"]),	1326	Convert.ToSingle(
1327	Convert.ToSingle(	1327	row["SitTargetOrientZ"]),
1328	row["SitTargetOrientW"])));	1328	Convert.ToSingle(
		1329	row["SitTargetOrientW"]));
1329	}	1330	}
1330	catch (InvalidCastException)	1331	catch (InvalidCastException)
1331	{	1332	{
@@ -1584,12 +1585,12 @@ namespace OpenSim.Data.MySQL
1584	try	1585	try
1585	{	1586	{
1586	// Sit target	1587	// Sit target
1587	LLVector3 sitTargetPos = prim.GetSitTargetPositionLL();	1588	LLVector3 sitTargetPos = prim.SitTargetPositionLL;
1588	row["SitTargetOffsetX"] = sitTargetPos.X;	1589	row["SitTargetOffsetX"] = sitTargetPos.X;
1589	row["SitTargetOffsetY"] = sitTargetPos.Y;	1590	row["SitTargetOffsetY"] = sitTargetPos.Y;
1590	row["SitTargetOffsetZ"] = sitTargetPos.Z;	1591	row["SitTargetOffsetZ"] = sitTargetPos.Z;
1591		1592
1592	LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL();	1593	LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
1593	row["SitTargetOrientW"] = sitTargetOrient.W;	1594	row["SitTargetOrientW"] = sitTargetOrient.W;
1594	row["SitTargetOrientX"] = sitTargetOrient.X;	1595	row["SitTargetOrientX"] = sitTargetOrient.X;
1595	row["SitTargetOrientY"] = sitTargetOrient.Y;	1596	row["SitTargetOrientY"] = sitTargetOrient.Y;