diff options
author | Justin Clark-Casey (justincc) | 2012-03-09 00:20:10 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-09 00:20:10 +0000 |
commit | df4b06aed13560e54e3aac4b719f3fbc6ea6fffe (patch) | |
tree | 099e78dfbe9fd3c98629727320f2bda3d520c59b | |
parent | Merge branch 'xassetservice' (diff) | |
parent | Fixes mantis #5923 (diff) | |
download | opensim-SC-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.zip opensim-SC-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.tar.gz opensim-SC-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.tar.bz2 opensim-SC-df4b06aed13560e54e3aac4b719f3fbc6ea6fffe.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 56 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 5 |
2 files changed, 32 insertions, 29 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ec6bb89..9d5cdfa 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -457,15 +457,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
457 | // without the parent rotation applied. | 457 | // without the parent rotation applied. |
458 | if (ParentID != 0) | 458 | if (ParentID != 0) |
459 | { | 459 | { |
460 | SceneObjectPart part = m_scene.GetSceneObjectPart(ParentID); | 460 | SceneObjectPart part = ParentPart; |
461 | if (part != null) | 461 | return part.AbsolutePosition + (m_pos * part.GetWorldRotation()); |
462 | { | ||
463 | return part.AbsolutePosition + (m_pos * part.GetWorldRotation()); | ||
464 | } | ||
465 | else | ||
466 | { | ||
467 | return ParentPosition + m_pos; | ||
468 | } | ||
469 | } | 462 | } |
470 | } | 463 | } |
471 | return m_pos; | 464 | return m_pos; |
@@ -576,6 +569,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
576 | } | 569 | } |
577 | private uint m_parentID; | 570 | private uint m_parentID; |
578 | 571 | ||
572 | public SceneObjectPart ParentPart | ||
573 | { | ||
574 | get { return m_parentPart; } | ||
575 | set { m_parentPart = value; } | ||
576 | } | ||
577 | private SceneObjectPart m_parentPart = null; | ||
578 | |||
579 | public float Health | 579 | public float Health |
580 | { | 580 | { |
581 | get { return m_health; } | 581 | get { return m_health; } |
@@ -1751,36 +1751,34 @@ namespace OpenSim.Region.Framework.Scenes | |||
1751 | 1751 | ||
1752 | if (ParentID != 0) | 1752 | if (ParentID != 0) |
1753 | { | 1753 | { |
1754 | SceneObjectPart part = m_scene.GetSceneObjectPart(ParentID); | 1754 | SceneObjectPart part = ParentPart; |
1755 | if (part != null) | 1755 | TaskInventoryDictionary taskIDict = part.TaskInventory; |
1756 | if (taskIDict != null) | ||
1756 | { | 1757 | { |
1757 | TaskInventoryDictionary taskIDict = part.TaskInventory; | 1758 | lock (taskIDict) |
1758 | if (taskIDict != null) | ||
1759 | { | 1759 | { |
1760 | lock (taskIDict) | 1760 | foreach (UUID taskID in taskIDict.Keys) |
1761 | { | 1761 | { |
1762 | foreach (UUID taskID in taskIDict.Keys) | 1762 | UnRegisterControlEventsToScript(LocalId, taskID); |
1763 | { | 1763 | taskIDict[taskID].PermsMask &= ~( |
1764 | UnRegisterControlEventsToScript(LocalId, taskID); | 1764 | 2048 | //PERMISSION_CONTROL_CAMERA |
1765 | taskIDict[taskID].PermsMask &= ~( | 1765 | 4); // PERMISSION_TAKE_CONTROLS |
1766 | 2048 | //PERMISSION_CONTROL_CAMERA | ||
1767 | 4); // PERMISSION_TAKE_CONTROLS | ||
1768 | } | ||
1769 | } | 1766 | } |
1770 | } | 1767 | } |
1768 | } | ||
1771 | 1769 | ||
1772 | // Reset sit target. | 1770 | // Reset sit target. |
1773 | if (part.SitTargetAvatar == UUID) | 1771 | if (part.SitTargetAvatar == UUID) |
1774 | part.SitTargetAvatar = UUID.Zero; | 1772 | part.SitTargetAvatar = UUID.Zero; |
1775 | 1773 | ||
1776 | ParentPosition = part.GetWorldPosition(); | 1774 | ParentPosition = part.GetWorldPosition(); |
1777 | ControllingClient.SendClearFollowCamProperties(part.ParentUUID); | 1775 | ControllingClient.SendClearFollowCamProperties(part.ParentUUID); |
1778 | } | ||
1779 | 1776 | ||
1780 | m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); | 1777 | m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); |
1781 | ParentPosition = Vector3.Zero; | 1778 | ParentPosition = Vector3.Zero; |
1782 | 1779 | ||
1783 | ParentID = 0; | 1780 | ParentID = 0; |
1781 | ParentPart = null; | ||
1784 | SendAvatarDataToAllAgents(); | 1782 | SendAvatarDataToAllAgents(); |
1785 | m_requestedSitTargetID = 0; | 1783 | m_requestedSitTargetID = 0; |
1786 | 1784 | ||
@@ -2212,6 +2210,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2212 | return; | 2210 | return; |
2213 | } | 2211 | } |
2214 | 2212 | ||
2213 | ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); | ||
2214 | if (ParentPart == null) | ||
2215 | return; | ||
2216 | |||
2215 | ParentID = m_requestedSitTargetID; | 2217 | ParentID = m_requestedSitTargetID; |
2216 | 2218 | ||
2217 | Velocity = Vector3.Zero; | 2219 | Velocity = Vector3.Zero; |
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 0a59f86..4e38687 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -296,9 +296,10 @@ namespace OpenSim.Services.HypergridService | |||
296 | aCircuit.firstname = account.FirstName; | 296 | aCircuit.firstname = account.FirstName; |
297 | aCircuit.lastname = account.LastName; | 297 | aCircuit.lastname = account.LastName; |
298 | } | 298 | } |
299 | if (account == null && !aCircuit.lastname.StartsWith("@")) | 299 | if (account == null) |
300 | { | 300 | { |
301 | aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname; | 301 | if (!aCircuit.lastname.StartsWith("@")) |
302 | aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname; | ||
302 | try | 303 | try |
303 | { | 304 | { |
304 | Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString()); | 305 | Uri uri = new Uri(aCircuit.ServiceURLs["HomeURI"].ToString()); |