diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 32dc7d5..bc80915 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1284,10 +1284,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1284 | byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, | 1284 | byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, |
1285 | byte RayEndIsIntersection) | 1285 | byte RayEndIsIntersection) |
1286 | { | 1286 | { |
1287 | LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f, 0.5f, 0.5f), false); | ||
1287 | 1288 | ||
1288 | LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false); | 1289 | if (ExternalChecks.ExternalChecksCanRezObject(1, ownerID, pos)) |
1289 | |||
1290 | if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos)) | ||
1291 | { | 1290 | { |
1292 | // rez ON the ground, not IN the ground | 1291 | // rez ON the ground, not IN the ground |
1293 | pos.Z += 0.25F; | 1292 | pos.Z += 0.25F; |
@@ -1515,8 +1514,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1515 | } | 1514 | } |
1516 | } | 1515 | } |
1517 | } | 1516 | } |
1518 | |||
1519 | |||
1520 | } | 1517 | } |
1521 | } | 1518 | } |
1522 | return true; | 1519 | return true; |
@@ -1525,7 +1522,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1525 | { | 1522 | { |
1526 | return false; | 1523 | return false; |
1527 | } | 1524 | } |
1528 | |||
1529 | } | 1525 | } |
1530 | 1526 | ||
1531 | #endregion | 1527 | #endregion |
@@ -1658,6 +1654,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1658 | 1654 | ||
1659 | EventManager.TriggerOnNewClient(client); | 1655 | EventManager.TriggerOnNewClient(client); |
1660 | } | 1656 | } |
1657 | |||
1661 | public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client) | 1658 | public virtual void TeleportClientHome(LLUUID AgentId, IClientAPI client) |
1662 | { | 1659 | { |
1663 | UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(AgentId); | 1660 | UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(AgentId); |
@@ -1701,7 +1698,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1701 | EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false); | 1698 | EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false); |
1702 | 1699 | ||
1703 | // Un-comment out the following line to Get Raytrace results printed to the console. | 1700 | // Un-comment out the following line to Get Raytrace results printed to the console. |
1704 | // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); | 1701 | // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); |
1705 | float ScaleOffset = 0.5f; | 1702 | float ScaleOffset = 0.5f; |
1706 | 1703 | ||
1707 | // If we hit something | 1704 | // If we hit something |
@@ -1745,18 +1742,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1745 | m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID); | 1742 | m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID); |
1746 | } | 1743 | } |
1747 | 1744 | ||
1748 | |||
1749 | return; | 1745 | return; |
1750 | } | 1746 | } |
1751 | return; | ||
1752 | |||
1753 | 1747 | ||
1748 | return; | ||
1754 | } | 1749 | } |
1755 | |||
1756 | |||
1757 | |||
1758 | |||
1759 | } | 1750 | } |
1751 | |||
1760 | public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags) | 1752 | public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags) |
1761 | { | 1753 | { |
1762 | UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId); | 1754 | UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(remoteClient.AgentId); |
@@ -1938,7 +1930,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1938 | } | 1930 | } |
1939 | } | 1931 | } |
1940 | } | 1932 | } |
1941 | |||
1942 | } | 1933 | } |
1943 | 1934 | ||
1944 | public override void CloseAllAgents(uint circuitcode) | 1935 | public override void CloseAllAgents(uint circuitcode) |
@@ -2014,7 +2005,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2014 | m_sceneGridService.Close(); | 2005 | m_sceneGridService.Close(); |
2015 | } | 2006 | } |
2016 | 2007 | ||
2017 | |||
2018 | /// <summary> | 2008 | /// <summary> |
2019 | /// Do the work necessary to initiate a new user connection. | 2009 | /// Do the work necessary to initiate a new user connection. |
2020 | /// At the moment, this consists of setting up the caps infrastructure | 2010 | /// At the moment, this consists of setting up the caps infrastructure |
@@ -2164,7 +2154,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2164 | childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); | 2154 | childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); |
2165 | // Not Implemented: | 2155 | // Not Implemented: |
2166 | //TODO: Do we need to pass the message on to one of our neighbors? | 2156 | //TODO: Do we need to pass the message on to one of our neighbors? |
2167 | |||
2168 | } | 2157 | } |
2169 | return true; | 2158 | return true; |
2170 | } | 2159 | } |