diff options
author | UbitUmarov | 2016-11-14 03:21:07 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-14 03:21:07 +0000 |
commit | ae17b5d203677ff99cf0c3ee9d9ec9309600b568 (patch) | |
tree | a6155da7bc16d17f7a68a9eda0b78b4c72e4c9d4 /OpenSim/Region/ClientStack/Linden | |
parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-ae17b5d203677ff99cf0c3ee9d9ec9309600b568.zip opensim-SC-ae17b5d203677ff99cf0c3ee9d9ec9309600b568.tar.gz opensim-SC-ae17b5d203677ff99cf0c3ee9d9ec9309600b568.tar.bz2 opensim-SC-ae17b5d203677ff99cf0c3ee9d9ec9309600b568.tar.xz |
reduce calls to physics world cast rays for camera collision check
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 99c9049..46c6a19 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -6263,7 +6263,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6263 | 6263 | ||
6264 | bool movement = CheckAgentMovementUpdateSignificance(x); | 6264 | bool movement = CheckAgentMovementUpdateSignificance(x); |
6265 | bool camera = CheckAgentCameraUpdateSignificance(x); | 6265 | bool camera = CheckAgentCameraUpdateSignificance(x); |
6266 | 6266 | ||
6267 | // Was there a significant movement/state change? | 6267 | // Was there a significant movement/state change? |
6268 | if (movement) | 6268 | if (movement) |
6269 | { | 6269 | { |
@@ -6274,6 +6274,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6274 | m_thisAgentUpdateArgs.HeadRotation = x.HeadRotation; | 6274 | m_thisAgentUpdateArgs.HeadRotation = x.HeadRotation; |
6275 | m_thisAgentUpdateArgs.State = x.State; | 6275 | m_thisAgentUpdateArgs.State = x.State; |
6276 | 6276 | ||
6277 | m_thisAgentUpdateArgs.NeedsCameraCollision = !camera; | ||
6278 | |||
6277 | UpdateAgent handlerAgentUpdate = OnAgentUpdate; | 6279 | UpdateAgent handlerAgentUpdate = OnAgentUpdate; |
6278 | UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate; | 6280 | UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate; |
6279 | 6281 | ||
@@ -6282,7 +6284,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6282 | 6284 | ||
6283 | if (handlerAgentUpdate != null) | 6285 | if (handlerAgentUpdate != null) |
6284 | OnAgentUpdate(this, m_thisAgentUpdateArgs); | 6286 | OnAgentUpdate(this, m_thisAgentUpdateArgs); |
6285 | 6287 | ||
6286 | } | 6288 | } |
6287 | 6289 | ||
6288 | // Was there a significant camera(s) change? | 6290 | // Was there a significant camera(s) change? |
@@ -6293,6 +6295,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6293 | m_thisAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis; | 6295 | m_thisAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis; |
6294 | m_thisAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis; | 6296 | m_thisAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis; |
6295 | 6297 | ||
6298 | m_thisAgentUpdateArgs.NeedsCameraCollision = true; | ||
6299 | |||
6296 | UpdateAgent handlerAgentCameraUpdate = OnAgentCameraUpdate; | 6300 | UpdateAgent handlerAgentCameraUpdate = OnAgentCameraUpdate; |
6297 | 6301 | ||
6298 | if (handlerAgentCameraUpdate != null) | 6302 | if (handlerAgentCameraUpdate != null) |