diff options
| author | UbitUmarov | 2017-06-10 02:48:51 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-06-10 02:48:51 +0100 |
| commit | b5910cfdb7461d523e2dc34dc9f33fe096766525 (patch) | |
| tree | c8fa1bfd77c9b77f636117b953422f2cf66c0c07 /OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | add a adicional in transit flag to signal HG tps, and use it to ignore userna... (diff) | |
| download | opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.zip opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.gz opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.bz2 opensim-SC-b5910cfdb7461d523e2dc34dc9f33fe096766525.tar.xz | |
merge
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs index 923e2ff..a5ee2c9 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs | |||
| @@ -936,7 +936,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 936 | repData.actor.Name, asset.ID.ToString()); | 936 | repData.actor.Name, asset.ID.ToString()); |
| 937 | } | 937 | } |
| 938 | else | 938 | else |
| 939 | m_log.WarnFormat("[PHYSICS]: asset provider returned null asset fo mesh of prim {0}.", | 939 | m_log.WarnFormat("[PHYSICS]: asset provider returned null asset for mesh of prim {0}.", |
| 940 | repData.actor.Name); | 940 | repData.actor.Name); |
| 941 | } | 941 | } |
| 942 | } | 942 | } |