aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin
diff options
context:
space:
mode:
authorubit2012-10-19 04:53:22 +0200
committerubit2012-10-19 04:53:22 +0200
commita936b9b7d3e8d623fec91ebd24d1f3115696892b (patch)
tree632aff5d29a308ae5a11169204e0a2c0b920acd4 /OpenSim/Region/Physics/UbitOdePlugin
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentUbitOde stop doing a copy of the asset data using just the reference to (diff)
downloadopensim-SC-a936b9b7d3e8d623fec91ebd24d1f3115696892b.zip
opensim-SC-a936b9b7d3e8d623fec91ebd24d1f3115696892b.tar.gz
opensim-SC-a936b9b7d3e8d623fec91ebd24d1f3115696892b.tar.bz2
opensim-SC-a936b9b7d3e8d623fec91ebd24d1f3115696892b.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs5
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 }