diff options
author | Melanie Thielker | 2014-09-27 21:17:56 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-09-27 21:17:56 +0200 |
commit | f60139cb918833711ac6d1b4df66c0507db0515d (patch) | |
tree | 47390c7cd8ac00c3f871d42af139fcc7c69ea90e /OpenSim | |
parent | Make changes to AnimationSet to allow indexing by names rather than indices. ... (diff) | |
download | opensim-SC_OLD-f60139cb918833711ac6d1b4df66c0507db0515d.zip opensim-SC_OLD-f60139cb918833711ac6d1b4df66c0507db0515d.tar.gz opensim-SC_OLD-f60139cb918833711ac6d1b4df66c0507db0515d.tar.bz2 opensim-SC_OLD-f60139cb918833711ac6d1b4df66c0507db0515d.tar.xz |
Reinstate the part of the id theft protection that was lost in a long ago merge
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 1e14f45..96c7e8c 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -172,6 +172,16 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
172 | { | 172 | { |
173 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 173 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
174 | 174 | ||
175 | // Here we need to get the old asset to extract the | ||
176 | // texture UUIDs if it's a wearable. | ||
177 | if (item.Type == (int)AssetType.Bodypart || | ||
178 | item.Type == (int)AssetType.Clothing) | ||
179 | { | ||
180 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); | ||
181 | if (oldAsset != null) | ||
182 | uploader.SetOldData(oldAsset.Data); | ||
183 | } | ||
184 | |||
175 | uploader.RequestUpdateTaskInventoryItem(remoteClient, item); | 185 | uploader.RequestUpdateTaskInventoryItem(remoteClient, item); |
176 | } | 186 | } |
177 | 187 | ||
@@ -180,6 +190,16 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
180 | { | 190 | { |
181 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 191 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
182 | 192 | ||
193 | // Here we need to get the old asset to extract the | ||
194 | // texture UUIDs if it's a wearable. | ||
195 | if (item.AssetType == (int)AssetType.Bodypart || | ||
196 | item.AssetType == (int)AssetType.Clothing) | ||
197 | { | ||
198 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); | ||
199 | if (oldAsset != null) | ||
200 | uploader.SetOldData(oldAsset.Data); | ||
201 | } | ||
202 | |||
183 | uploader.RequestUpdateInventoryItem(remoteClient, item); | 203 | uploader.RequestUpdateInventoryItem(remoteClient, item); |
184 | } | 204 | } |
185 | } | 205 | } |