diff options
author | Justin Clark-Casey (justincc) | 2011-07-16 03:16:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-16 03:16:24 +0100 |
commit | 6f9b8557192ea5fe65e4dc7416809a4d1affa954 (patch) | |
tree | 7a493d3b3a70ebaf71d05cf93ebf45f38e272967 /OpenSim/Region | |
parent | eliminate unused and redundant SceneObjectGroup.AssetReceived() (diff) | |
download | opensim-SC_OLD-6f9b8557192ea5fe65e4dc7416809a4d1affa954.zip opensim-SC_OLD-6f9b8557192ea5fe65e4dc7416809a4d1affa954.tar.gz opensim-SC_OLD-6f9b8557192ea5fe65e4dc7416809a4d1affa954.tar.bz2 opensim-SC_OLD-6f9b8557192ea5fe65e4dc7416809a4d1affa954.tar.xz |
refactor: remove pointless sender != null tests, etc, in AssetReceived, since the method called always belongs to the object that generated the request
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a55e07a..697dd0e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1711,7 +1711,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1711 | { | 1711 | { |
1712 | if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero) | 1712 | if (dupe.m_shape.SculptEntry && dupe.m_shape.SculptTexture != UUID.Zero) |
1713 | { | 1713 | { |
1714 | m_parentGroup.Scene.AssetService.Get(dupe.m_shape.SculptTexture.ToString(), dupe, AssetReceived); | 1714 | ParentGroup.Scene.AssetService.Get( |
1715 | dupe.m_shape.SculptTexture.ToString(), dupe, dupe.AssetReceived); | ||
1715 | } | 1716 | } |
1716 | 1717 | ||
1717 | bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0); | 1718 | bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0); |
@@ -1725,14 +1726,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1725 | return dupe; | 1726 | return dupe; |
1726 | } | 1727 | } |
1727 | 1728 | ||
1729 | /// <summary> | ||
1730 | /// Called back by asynchronous asset fetch. | ||
1731 | /// </summary> | ||
1732 | /// <param name="id">ID of asset received</param> | ||
1733 | /// <param name="sender">Register</param> | ||
1734 | /// <param name="asset"></param> | ||
1728 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 1735 | protected void AssetReceived(string id, Object sender, AssetBase asset) |
1729 | { | 1736 | { |
1730 | if (asset != null) | 1737 | if (asset != null) |
1731 | { | 1738 | SculptTextureCallback(asset); |
1732 | SceneObjectPart sop = (SceneObjectPart)sender; | ||
1733 | if (sop != null) | ||
1734 | sop.SculptTextureCallback(asset); | ||
1735 | } | ||
1736 | } | 1739 | } |
1737 | 1740 | ||
1738 | public static SceneObjectPart Create() | 1741 | public static SceneObjectPart Create() |