aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorSean Dague2008-07-07 20:12:14 +0000
committerSean Dague2008-07-07 20:12:14 +0000
commit867d72c9569e672d99dc5f50aca6b1a4f2ddf906 (patch)
treec7eed9e29967623643fa63ddec600acc2948ebb4 /OpenSim/Data
parentremove build references to what I believe to be the very old MSSQL (diff)
downloadopensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.zip
opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.tar.gz
opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.tar.bz2
opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.tar.xz
change SitTarget calls from functions to properties
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs29
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs29
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs29
3 files changed, 45 insertions, 42 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 4cb2b45..d9d41e0 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -932,18 +932,19 @@ namespace OpenSim.Data.MSSQL
932 ); 932 );
933 try 933 try
934 { 934 {
935 prim.SetSitTargetLL(new LLVector3( 935 prim.SitTargetPositionLL = new LLVector3(
936 Convert.ToSingle(row["SitTargetOffsetX"]), 936 Convert.ToSingle(row["SitTargetOffsetX"]),
937 Convert.ToSingle(row["SitTargetOffsetY"]), 937 Convert.ToSingle(row["SitTargetOffsetY"]),
938 Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion( 938 Convert.ToSingle(row["SitTargetOffsetZ"]));
939 Convert.ToSingle( 939 prim.SitTargetOrientationLL = new LLQuaternion(
940 row["SitTargetOrientX"]), 940 Convert.ToSingle(
941 Convert.ToSingle( 941 row["SitTargetOrientX"]),
942 row["SitTargetOrientY"]), 942 Convert.ToSingle(
943 Convert.ToSingle( 943 row["SitTargetOrientY"]),
944 row["SitTargetOrientZ"]), 944 Convert.ToSingle(
945 Convert.ToSingle( 945 row["SitTargetOrientZ"]),
946 row["SitTargetOrientW"]))); 946 Convert.ToSingle(
947 row["SitTargetOrientW"]));
947 } 948 }
948 catch (InvalidCastException) 949 catch (InvalidCastException)
949 { 950 {
@@ -1136,12 +1137,12 @@ namespace OpenSim.Data.MSSQL
1136 try 1137 try
1137 { 1138 {
1138 // Sit target 1139 // Sit target
1139 LLVector3 sitTargetPos = prim.GetSitTargetPositionLL(); 1140 LLVector3 sitTargetPos = prim.SitTargetPositionLL;
1140 row["SitTargetOffsetX"] = sitTargetPos.X; 1141 row["SitTargetOffsetX"] = sitTargetPos.X;
1141 row["SitTargetOffsetY"] = sitTargetPos.Y; 1142 row["SitTargetOffsetY"] = sitTargetPos.Y;
1142 row["SitTargetOffsetZ"] = sitTargetPos.Z; 1143 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1143 1144
1144 LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL(); 1145 LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL;
1145 row["SitTargetOrientW"] = sitTargetOrient.W; 1146 row["SitTargetOrientW"] = sitTargetOrient.W;
1146 row["SitTargetOrientX"] = sitTargetOrient.X; 1147 row["SitTargetOrientX"] = sitTargetOrient.X;
1147 row["SitTargetOrientY"] = sitTargetOrient.Y; 1148 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;
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;
generated by cgit v1.1 at 2024-11-10 16:32:31 +0000