diff options
| author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
| commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
| tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Region/PhysicsModules | |
| parent | fix cut points of UTF-8 strings (diff) | |
| parent | Minor: Add an initializer to show what the default value would be. (diff) | |
| download | opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz | |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs index c244f95..b9cd6f5 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | |||
| @@ -33,3 +33,4 @@ using System.Runtime.InteropServices; | |||
| 33 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
| 34 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
| 35 | [assembly: AssemblyVersion("0.8.3.*")] | 35 | [assembly: AssemblyVersion("0.8.3.*")] |
| 36 | |||
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs index 743a6f6..6199387 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs | |||
| @@ -172,7 +172,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
| 172 | /// <param name="req"></param> | 172 | /// <param name="req"></param> |
| 173 | private void RayCast(ODERayCastRequest req) | 173 | private void RayCast(ODERayCastRequest req) |
| 174 | { | 174 | { |
| 175 | // NOTE: limit ray lenght or collisions will take all avaiable stack space | 175 | // NOTE: limit ray length or collisions will take all avaiable stack space |
| 176 | // this value may still be too large, depending on machine configuration | 176 | // this value may still be too large, depending on machine configuration |
| 177 | // of maximum stack | 177 | // of maximum stack |
| 178 | float len = req.length; | 178 | float len = req.length; |