aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs29
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs29
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs29
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs56
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs29
8 files changed, 87 insertions, 103 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;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2b40ad2..685a3d5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1508,28 +1508,6 @@ namespace OpenSim.Region.Environment.Scenes
1508 return LLUUID.Zero; 1508 return LLUUID.Zero;
1509 } 1509 }
1510 1510
1511 public Quaternion GetSitTargetOrientation()
1512 {
1513 return m_sitTargetOrientation;
1514 }
1515
1516 public LLQuaternion GetSitTargetOrientationLL()
1517 {
1518 return
1519 new LLQuaternion(m_sitTargetOrientation.x, m_sitTargetOrientation.y, m_sitTargetOrientation.z,
1520 m_sitTargetOrientation.w);
1521 }
1522
1523 public Vector3 GetSitTargetPosition()
1524 {
1525 return m_sitTargetPosition;
1526 }
1527
1528 public LLVector3 GetSitTargetPositionLL()
1529 {
1530 return new LLVector3(m_sitTargetPosition.x, m_sitTargetPosition.y, m_sitTargetPosition.z);
1531 }
1532
1533 /// <summary> 1511 /// <summary>
1534 /// Method for a prim to get it's world position from the group. 1512 /// Method for a prim to get it's world position from the group.
1535 /// Remember, the Group Position simply gives the position of the group itself 1513 /// Remember, the Group Position simply gives the position of the group itself
@@ -2382,23 +2360,23 @@ namespace OpenSim.Region.Environment.Scenes
2382 aggregateScriptEvents(); 2360 aggregateScriptEvents();
2383 } 2361 }
2384 2362
2385 public void SetSitTarget(Vector3 offset, Quaternion orientation) 2363 // public void SetSitTarget(Vector3 offset, Quaternion orientation)
2386 { 2364 // {
2387 m_sitTargetPosition = offset; 2365 // m_sitTargetPosition = offset;
2388 m_sitTargetOrientation = orientation; 2366 // m_sitTargetOrientation = orientation;
2389 } 2367 // }
2390 2368
2391 // Utility function so the databases don't have to reference axiom.math 2369 // // Utility function so the databases don't have to reference axiom.math
2392 public void SetSitTargetLL(LLVector3 offset, LLQuaternion orientation) 2370 // public void SetSitTargetLL(LLVector3 offset, LLQuaternion orientation)
2393 { 2371 // {
2394 if ( 2372 // if (
2395 !(offset.X == 0 && offset.Y == 0 && offset.Z == 0 && (orientation.W == 0 || orientation.W == 1) && 2373 // !(offset.X == 0 && offset.Y == 0 && offset.Z == 0 && (orientation.W == 0 || orientation.W == 1) &&
2396 orientation.X == 0 && orientation.Y == 0 && orientation.Z == 0)) 2374 // orientation.X == 0 && orientation.Y == 0 && orientation.Z == 0))
2397 { 2375 // {
2398 m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z); 2376 // m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z);
2399 m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z); 2377 // m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z);
2400 } 2378 // }
2401 } 2379 // }
2402 2380
2403 /// <summary> 2381 /// <summary>
2404 /// Set the text displayed for this part. 2382 /// Set the text displayed for this part.
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 22ca159..a0a76cf 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1096,8 +1096,8 @@ namespace OpenSim.Region.Environment.Scenes
1096 foreach (SceneObjectPart part in partArray) 1096 foreach (SceneObjectPart part in partArray)
1097 { 1097 {
1098 // Is a sit target available? 1098 // Is a sit target available?
1099 Vector3 avSitOffSet = part.GetSitTargetPosition(); 1099 Vector3 avSitOffSet = part.SitTargetPosition;
1100 Quaternion avSitOrientation = part.GetSitTargetOrientation(); 1100 Quaternion avSitOrientation = part.SitTargetOrientation;
1101 LLUUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1101 LLUUID avOnTargetAlready = part.GetAvatarOnSitTarget();
1102 1102
1103 bool SitTargetUnOccupied = (!(avOnTargetAlready != LLUUID.Zero)); 1103 bool SitTargetUnOccupied = (!(avOnTargetAlready != LLUUID.Zero));
@@ -1130,8 +1130,8 @@ namespace OpenSim.Region.Environment.Scenes
1130 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it 1130 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
1131 1131
1132 // Is a sit target available? 1132 // Is a sit target available?
1133 Vector3 avSitOffSet = part.GetSitTargetPosition(); 1133 Vector3 avSitOffSet = part.SitTargetPosition;
1134 Quaternion avSitOrientation = part.GetSitTargetOrientation(); 1134 Quaternion avSitOrientation = part.SitTargetOrientation;
1135 LLUUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1135 LLUUID avOnTargetAlready = part.GetAvatarOnSitTarget();
1136 1136
1137 bool SitTargetUnOccupied = (!(avOnTargetAlready != LLUUID.Zero)); 1137 bool SitTargetUnOccupied = (!(avOnTargetAlready != LLUUID.Zero));
@@ -1222,8 +1222,8 @@ namespace OpenSim.Region.Environment.Scenes
1222 { 1222 {
1223 if (part.GetAvatarOnSitTarget() == UUID) 1223 if (part.GetAvatarOnSitTarget() == UUID)
1224 { 1224 {
1225 Vector3 sitTargetPos = part.GetSitTargetPosition(); 1225 Vector3 sitTargetPos = part.SitTargetPosition;
1226 Quaternion sitTargetOrient = part.GetSitTargetOrientation(); 1226 Quaternion sitTargetOrient = part.SitTargetOrientation;
1227 1227
1228 //Quaternion vq = new Quaternion(sitTargetPos.x, sitTargetPos.y+0.2f, sitTargetPos.z+0.2f, 0); 1228 //Quaternion vq = new Quaternion(sitTargetPos.x, sitTargetPos.y+0.2f, sitTargetPos.z+0.2f, 0);
1229 //Quaternion nq = new Quaternion(sitTargetOrient.w, -sitTargetOrient.x, -sitTargetOrient.y, -sitTargetOrient.z); 1229 //Quaternion nq = new Quaternion(sitTargetOrient.w, -sitTargetOrient.x, -sitTargetOrient.y, -sitTargetOrient.z);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 1aa7ae3..e0b6e5d 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4494,7 +4494,8 @@ namespace OpenSim.Region.ScriptEngine.Common
4494 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0) 4494 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
4495 rot.z = 1; // ZERO_ROTATION = 0,0,0,1 4495 rot.z = 1; // ZERO_ROTATION = 0,0,0,1
4496 4496
4497 m_host.SetSitTarget(new Vector3((float)offset.x, (float)offset.y, (float)offset.z), new Quaternion((float)rot.s, (float)rot.x, (float)rot.y, (float)rot.z)); 4497 m_host.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
4498 m_host.SitTargetOrientation = new Quaternion((float)rot.s, (float)rot.x, (float)rot.y, (float)rot.z);
4498 } 4499 }
4499 4500
4500 public string llAvatarOnSitTarget() 4501 public string llAvatarOnSitTarget()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2525de0..b89965a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4369,7 +4369,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4369 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0) 4369 if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
4370 rot.z = 1; // ZERO_ROTATION = 0,0,0,1 4370 rot.z = 1; // ZERO_ROTATION = 0,0,0,1
4371 4371
4372 m_host.SetSitTarget(new Vector3((float)offset.x, (float)offset.y, (float)offset.z), new Quaternion((float)rot.s, (float)rot.x, (float)rot.y, (float)rot.z)); 4372 m_host.SitTargetPosition = new Vector3((float)offset.x, (float)offset.y, (float)offset.z);
4373 m_host.SitTargetOrientation = new Quaternion((float)rot.s, (float)rot.x, (float)rot.y, (float)rot.z);
4373 } 4374 }
4374 4375
4375 public string llAvatarOnSitTarget() 4376 public string llAvatarOnSitTarget()
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;
generated by cgit v1.1 at 2024-11-06 00:26:42 +0000