diff options
| author | Melanie Thielker | 2014-09-27 22:18:43 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-09-27 22:18:43 +0200 |
| commit | dbc0dfa606b7a344e1b7daf3653c360656f9b319 (patch) | |
| tree | 70440cbb86f8e9f815fb3b7eab6fe0eea40cb63b /OpenSim/Region/CoreModules/Agent | |
| parent | Reinstate the part of the id theft protection that was lost in a long ago merge (diff) | |
| download | opensim-SC_OLD-dbc0dfa606b7a344e1b7daf3653c360656f9b319.zip opensim-SC_OLD-dbc0dfa606b7a344e1b7daf3653c360656f9b319.tar.gz opensim-SC_OLD-dbc0dfa606b7a344e1b7daf3653c360656f9b319.tar.bz2 opensim-SC_OLD-dbc0dfa606b7a344e1b7daf3653c360656f9b319.tar.xz | |
Also fetch and store old asset for animation sets
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 96c7e8c..1a19585 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
| @@ -175,7 +175,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 175 | // Here we need to get the old asset to extract the | 175 | // Here we need to get the old asset to extract the |
| 176 | // texture UUIDs if it's a wearable. | 176 | // texture UUIDs if it's a wearable. |
| 177 | if (item.Type == (int)AssetType.Bodypart || | 177 | if (item.Type == (int)AssetType.Bodypart || |
| 178 | item.Type == (int)AssetType.Clothing) | 178 | item.Type == (int)AssetType.Clothing || |
| 179 | item.Type == (int)CustomAssetType.AnimationSet) | ||
| 179 | { | 180 | { |
| 180 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); | 181 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); |
| 181 | if (oldAsset != null) | 182 | if (oldAsset != null) |
| @@ -193,7 +194,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 193 | // Here we need to get the old asset to extract the | 194 | // Here we need to get the old asset to extract the |
| 194 | // texture UUIDs if it's a wearable. | 195 | // texture UUIDs if it's a wearable. |
| 195 | if (item.AssetType == (int)AssetType.Bodypart || | 196 | if (item.AssetType == (int)AssetType.Bodypart || |
| 196 | item.AssetType == (int)AssetType.Clothing) | 197 | item.AssetType == (int)AssetType.Clothing || |
| 198 | item.AssetType == (int)CustomAssetType.AnimationSet) | ||
| 197 | { | 199 | { |
| 198 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); | 200 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); |
| 199 | if (oldAsset != null) | 201 | if (oldAsset != null) |