diff options
| author | Justin Clark-Casey (justincc) | 2012-10-30 01:14:48 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-30 01:14:48 +0000 |
| commit | cccf6953276eda0af34fb7b8e95c2c4351db5546 (patch) | |
| tree | 0d99182400cf04f31ca4f91860e50ef38655f2cd /OpenSim/Region/Physics | |
| parent | Make MeshAssetReceived private. (diff) | |
| download | opensim-SC-cccf6953276eda0af34fb7b8e95c2c4351db5546.zip opensim-SC-cccf6953276eda0af34fb7b8e95c2c4351db5546.tar.gz opensim-SC-cccf6953276eda0af34fb7b8e95c2c4351db5546.tar.bz2 opensim-SC-cccf6953276eda0af34fb7b8e95c2c4351db5546.tar.xz | |
Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exception.
In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 5b49e3b..2637295 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -3351,7 +3351,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 3351 | 3351 | ||
| 3352 | private void MeshAssetReceived(AssetBase asset) | 3352 | private void MeshAssetReceived(AssetBase asset) |
| 3353 | { | 3353 | { |
| 3354 | if (asset.Data != null && asset.Data.Length > 0) | 3354 | if (asset != null && asset.Data != null && asset.Data.Length > 0) |
| 3355 | { | 3355 | { |
| 3356 | if (!_pbs.SculptEntry) | 3356 | if (!_pbs.SculptEntry) |
| 3357 | return; | 3357 | return; |