diff options
| author | Justin Clark-Casey (justincc) | 2012-10-30 01:07:14 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-30 01:07:14 +0000 |
| commit | aeeed29d627f7d40bbcc160bf446a019b54e8b32 (patch) | |
| tree | 705185f1e92ba0a480d1fb3003425247733dd4bb /OpenSim | |
| parent | refactoring to use assembly:classname style of configuration (diff) | |
| download | opensim-SC_OLD-aeeed29d627f7d40bbcc160bf446a019b54e8b32.zip opensim-SC_OLD-aeeed29d627f7d40bbcc160bf446a019b54e8b32.tar.gz opensim-SC_OLD-aeeed29d627f7d40bbcc160bf446a019b54e8b32.tar.bz2 opensim-SC_OLD-aeeed29d627f7d40bbcc160bf446a019b54e8b32.tar.xz | |
correct ODEPrim.MeshAssetReveived -> MeshAssetReceived
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 2548648..7c46ff8 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -3335,7 +3335,6 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 3335 | m_material = pMaterial; | 3335 | m_material = pMaterial; |
| 3336 | } | 3336 | } |
| 3337 | 3337 | ||
| 3338 | |||
| 3339 | private void CheckMeshAsset() | 3338 | private void CheckMeshAsset() |
| 3340 | { | 3339 | { |
| 3341 | if (_pbs.SculptEntry && !m_assetFailed && _pbs.SculptTexture != UUID.Zero) | 3340 | if (_pbs.SculptEntry && !m_assetFailed && _pbs.SculptTexture != UUID.Zero) |
| @@ -3345,12 +3344,12 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 3345 | { | 3344 | { |
| 3346 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; | 3345 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; |
| 3347 | if (assetProvider != null) | 3346 | if (assetProvider != null) |
| 3348 | assetProvider(_pbs.SculptTexture, MeshAssetReveived); | 3347 | assetProvider(_pbs.SculptTexture, MeshAssetReceived); |
| 3349 | }); | 3348 | }); |
| 3350 | } | 3349 | } |
| 3351 | } | 3350 | } |
| 3352 | 3351 | ||
| 3353 | void MeshAssetReveived(AssetBase asset) | 3352 | void MeshAssetReceived(AssetBase asset) |
| 3354 | { | 3353 | { |
| 3355 | if (asset.Data != null && asset.Data.Length > 0) | 3354 | if (asset.Data != null && asset.Data.Length > 0) |
| 3356 | { | 3355 | { |