diff options
author | Melanie | 2010-01-04 21:41:33 +0000 |
---|---|---|
committer | Melanie | 2010-01-04 21:41:33 +0000 |
commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |
parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
parent | Finish conversion if XInventoryService (diff) | |
download | opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs index 7314107..ba77dae 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | |||
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
110 | for (int i = 0; i < reqs.Length; i++) | 110 | for (int i = 0; i < reqs.Length; i++) |
111 | { | 111 | { |
112 | if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast | 112 | if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast |
113 | RayCast(reqs[i]); // if there isn't anyone to send results | 113 | RayCast(reqs[i]); // if there isn't anyone to send results |
114 | } | 114 | } |
115 | /* | 115 | /* |
116 | foreach (ODERayCastRequest req in m_PendingRequests) | 116 | foreach (ODERayCastRequest req in m_PendingRequests) |