diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 56 |
1 files changed, 17 insertions, 39 deletions
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. |