diff options
| author | Melanie | 2012-10-17 20:46:38 +0200 |
|---|---|---|
| committer | Melanie | 2012-10-17 20:46:38 +0200 |
| commit | 0ca96669321b1a33190d0d93ae8f7b3aee60f492 (patch) | |
| tree | ac3b6297630f461f468a13550eaabe571f993ac6 /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |
| parent | Allow the console to be used by gods as well as region owners. (diff) | |
| parent | coment a debug warning (diff) | |
| download | opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.zip opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.gz opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.bz2 opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs index 7e3ec63..8d7d3b3 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |||
| @@ -137,15 +137,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 137 | ODERayCastRequest[] reqs = m_PendingRequests.ToArray(); | 137 | ODERayCastRequest[] reqs = m_PendingRequests.ToArray(); |
| 138 | for (int i = 0; i < reqs.Length; i++) | 138 | for (int i = 0; i < reqs.Length; i++) |
| 139 | { | 139 | { |
| 140 | try | 140 | if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast |
| 141 | { | 141 | RayCast(reqs[i]); // if there isn't anyone to send results |
| 142 | if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast | ||
| 143 | RayCast(reqs[i]); // if there isn't anyone to send results | ||
| 144 | } | ||
| 145 | catch | ||
| 146 | { | ||
| 147 | //Fail silently | ||
| 148 | } | ||
| 149 | } | 142 | } |
| 150 | 143 | ||
| 151 | m_PendingRequests.Clear(); | 144 | m_PendingRequests.Clear(); |