diff options
author | Melanie | 2012-01-23 00:24:31 +0000 |
---|---|---|
committer | Melanie | 2012-01-23 00:24:31 +0000 |
commit | cd2bf64b873b4f34ead9f37a9f0e4605266e3617 (patch) | |
tree | 2824d0d90620f05f6aa7306ac506172f9826b8d5 /OpenSim/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.zip opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.gz opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.bz2 opensim-SC-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 2c9f7d2..01406ce 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -463,17 +463,14 @@ namespace OpenSim.Framework | |||
463 | } | 463 | } |
464 | 464 | ||
465 | // Connected Telehub position | 465 | // Connected Telehub position |
466 | private float m_TelehubPosX; | 466 | private Vector3 m_TelehubPos; |
467 | private float m_TelehubPosY; | ||
468 | private float m_TelehubPosZ; | ||
469 | public Vector3 TelehubPos | 467 | public Vector3 TelehubPos |
470 | { | 468 | { |
471 | get | 469 | get |
472 | { | 470 | { |
473 | if (HasTelehub) | 471 | if (HasTelehub) |
474 | { | 472 | { |
475 | Vector3 Pos = new Vector3(m_TelehubPosX, m_TelehubPosY, m_TelehubPosZ); | 473 | return m_TelehubPos; |
476 | return Pos; | ||
477 | } | 474 | } |
478 | else | 475 | else |
479 | { | 476 | { |
@@ -482,53 +479,18 @@ namespace OpenSim.Framework | |||
482 | } | 479 | } |
483 | set | 480 | set |
484 | { | 481 | { |
485 | 482 | m_TelehubPos = value; | |
486 | m_TelehubPosX = value.X; | ||
487 | m_TelehubPosY = value.Y; | ||
488 | m_TelehubPosZ = value.Z; | ||
489 | } | 483 | } |
490 | } | 484 | } |
491 | 485 | ||
492 | // Connected Telehub rotation | 486 | // Connected Telehub rotation |
493 | private float m_TelehubRotX; | 487 | private Quaternion m_TelehubRot; |
494 | private float m_TelehubRotY; | ||
495 | private float m_TelehubRotZ; | ||
496 | private float m_TelehubRotW; | ||
497 | public Quaternion TelehubRot | 488 | public Quaternion TelehubRot |
498 | { | 489 | { |
499 | get | 490 | get |
500 | { | 491 | { return m_TelehubRot; } |
501 | if (HasTelehub) | ||
502 | { | ||
503 | Quaternion quat = new Quaternion(); | ||
504 | |||
505 | quat.X = m_TelehubRotX; | ||
506 | quat.Y = m_TelehubRotY; | ||
507 | quat.Z = m_TelehubRotZ; | ||
508 | quat.W = m_TelehubRotW; | ||
509 | |||
510 | return quat; | ||
511 | } | ||
512 | else | ||
513 | { | ||
514 | // What else to do?? | ||
515 | Quaternion quat = new Quaternion(); | ||
516 | |||
517 | quat.X = m_TelehubRotX; | ||
518 | quat.X = m_TelehubRotY; | ||
519 | quat.X = m_TelehubRotZ; | ||
520 | quat.X = m_TelehubRotW; | ||
521 | |||
522 | return quat; | ||
523 | } | ||
524 | } | ||
525 | set | 492 | set |
526 | { | 493 | { m_TelehubRot = value; } |
527 | m_TelehubRotX = value.X; | ||
528 | m_TelehubRotY = value.Y; | ||
529 | m_TelehubRotZ = value.Z; | ||
530 | m_TelehubRotW = value.W; | ||
531 | } | ||
532 | } | 494 | } |
533 | 495 | ||
534 | // Our Connected Telehub's SpawnPoints | 496 | // Our Connected Telehub's SpawnPoints |