diff options
author | Teravus Ovares | 2008-09-06 22:28:51 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 22:28:51 +0000 |
commit | 3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe (patch) | |
tree | 78f306a05c126927d06936cd87ef9e6e0a1cdaf7 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | Mantis#1234. Thank you HomerHorwitz for a patch that: (diff) | |
download | opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.zip opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.gz opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.bz2 opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.xz |
* This changes gridcomms types back to our home grown wholy controlled types.
* These are different types then the OMV types because changing them causes just about all grid comms to break. If these were the libOMV types, then libOMV couldn't change them ever again after that.. or we'd have a breakage whenever they changed them.
* This might introduce a map issue. Still checking it out.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index e51f1be..1a4b0c9 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1862,12 +1862,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1862 | cadu.AgentID = UUID.Guid; | 1862 | cadu.AgentID = UUID.Guid; |
1863 | cadu.alwaysrun = m_setAlwaysRun; | 1863 | cadu.alwaysrun = m_setAlwaysRun; |
1864 | cadu.AVHeight = m_avHeight; | 1864 | cadu.AVHeight = m_avHeight; |
1865 | Vector3 tempCameraCenter = new Vector3(m_CameraCenter.X, m_CameraCenter.Y, m_CameraCenter.Z); | 1865 | sLLVector3 tempCameraCenter = new sLLVector3(new Vector3(m_CameraCenter.X, m_CameraCenter.Y, m_CameraCenter.Z)); |
1866 | cadu.cameraPosition = tempCameraCenter; | 1866 | cadu.cameraPosition = tempCameraCenter; |
1867 | cadu.drawdistance = m_DrawDistance; | 1867 | cadu.drawdistance = m_DrawDistance; |
1868 | cadu.godlevel = m_godlevel; | 1868 | cadu.godlevel = m_godlevel; |
1869 | cadu.GroupAccess = 0; | 1869 | cadu.GroupAccess = 0; |
1870 | cadu.Position = AbsolutePosition; | 1870 | cadu.Position = new sLLVector3(AbsolutePosition); |
1871 | cadu.regionHandle = m_scene.RegionInfo.RegionHandle; | 1871 | cadu.regionHandle = m_scene.RegionInfo.RegionHandle; |
1872 | float multiplier = 1; | 1872 | float multiplier = 1; |
1873 | int innacurateNeighbors = m_scene.GetInaccurateNeighborCount(); | 1873 | int innacurateNeighbors = m_scene.GetInaccurateNeighborCount(); |
@@ -1887,7 +1887,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1887 | 1887 | ||
1888 | 1888 | ||
1889 | 1889 | ||
1890 | cadu.Velocity = Velocity; | 1890 | cadu.Velocity = new sLLVector3(Velocity); |
1891 | m_scene.SendOutChildAgentUpdates(cadu,this); | 1891 | m_scene.SendOutChildAgentUpdates(cadu,this); |
1892 | m_LastChildAgentUpdatePosition.X = AbsolutePosition.X; | 1892 | m_LastChildAgentUpdatePosition.X = AbsolutePosition.X; |
1893 | m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y; | 1893 | m_LastChildAgentUpdatePosition.Y = AbsolutePosition.Y; |
@@ -2070,11 +2070,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
2070 | int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize; | 2070 | int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize; |
2071 | 2071 | ||
2072 | m_DrawDistance = cAgentData.drawdistance; | 2072 | m_DrawDistance = cAgentData.drawdistance; |
2073 | m_pos = new Vector3(cAgentData.Position.X + shiftx, cAgentData.Position.Y + shifty, cAgentData.Position.Z); | 2073 | m_pos = new Vector3(cAgentData.Position.x + shiftx, cAgentData.Position.y + shifty, cAgentData.Position.z); |
2074 | 2074 | ||
2075 | // It's hard to say here.. We can't really tell where the camera position is unless it's in world cordinates from the sending region | 2075 | // It's hard to say here.. We can't really tell where the camera position is unless it's in world cordinates from the sending region |
2076 | m_CameraCenter = | 2076 | m_CameraCenter = |
2077 | new Vector3(cAgentData.cameraPosition.X, cAgentData.cameraPosition.Y, cAgentData.cameraPosition.Z); | 2077 | new Vector3(cAgentData.cameraPosition.x, cAgentData.cameraPosition.y, cAgentData.cameraPosition.z); |
2078 | 2078 | ||
2079 | 2079 | ||
2080 | m_godlevel = cAgentData.godlevel; | 2080 | m_godlevel = cAgentData.godlevel; |