diff options
| author | Melanie | 2012-11-01 22:25:29 +0100 |
|---|---|---|
| committer | Melanie | 2012-11-01 22:25:29 +0100 |
| commit | cbe43c15ec9ef355a1e9751650b9588e186eb7b2 (patch) | |
| tree | f3e295704881db126b211a8ea488e29d86fb640f /OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs | |
| parent | Add AnimState to CADU (diff) | |
| parent | revert last change (diff) | |
| download | opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.zip opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.tar.gz opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.tar.bz2 opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs index 73dd2fd..5030cec 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs | |||
| @@ -914,8 +914,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 914 | if (repData.pbs.SculptTexture != repData.assetID) | 914 | if (repData.pbs.SculptTexture != repData.assetID) |
| 915 | return; | 915 | return; |
| 916 | 916 | ||
| 917 | repData.pbs.SculptData = new byte[asset.Data.Length]; | 917 | // repData.pbs.SculptData = new byte[asset.Data.Length]; |
| 918 | asset.Data.CopyTo(repData.pbs.SculptData,0); | 918 | // asset.Data.CopyTo(repData.pbs.SculptData,0); |
| 919 | repData.pbs.SculptData = asset.Data; | ||
| 919 | repData.meshState = MeshState.AssetOK; | 920 | repData.meshState = MeshState.AssetOK; |
| 920 | m_worker.AssetLoaded(repData); | 921 | m_worker.AssetLoaded(repData); |
| 921 | } | 922 | } |