diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index f56d17d..1a19585 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
152 | } | 152 | } |
153 | } | 153 | } |
154 | 154 | ||
155 | public void RequestCreateInventoryItem(IClientAPI remoteClient, | 155 | public bool RequestCreateInventoryItem(IClientAPI remoteClient, |
156 | UUID transactionID, UUID folderID, uint callbackID, | 156 | UUID transactionID, UUID folderID, uint callbackID, |
157 | string description, string name, sbyte invType, | 157 | string description, string name, sbyte invType, |
158 | sbyte type, byte wearableType, uint nextOwnerMask) | 158 | sbyte type, byte wearableType, uint nextOwnerMask) |
@@ -162,6 +162,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
162 | uploader.RequestCreateInventoryItem( | 162 | uploader.RequestCreateInventoryItem( |
163 | remoteClient, folderID, callbackID, | 163 | remoteClient, folderID, callbackID, |
164 | description, name, invType, type, wearableType, nextOwnerMask); | 164 | description, name, invType, type, wearableType, nextOwnerMask); |
165 | |||
166 | return true; | ||
165 | } | 167 | } |
166 | 168 | ||
167 | public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient, | 169 | public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient, |
@@ -170,6 +172,17 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
170 | { | 172 | { |
171 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 173 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
172 | 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 | item.Type == (int)CustomAssetType.AnimationSet) | ||
180 | { | ||
181 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); | ||
182 | if (oldAsset != null) | ||
183 | uploader.SetOldData(oldAsset.Data); | ||
184 | } | ||
185 | |||
173 | uploader.RequestUpdateTaskInventoryItem(remoteClient, item); | 186 | uploader.RequestUpdateTaskInventoryItem(remoteClient, item); |
174 | } | 187 | } |
175 | 188 | ||
@@ -178,7 +191,18 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
178 | { | 191 | { |
179 | AssetXferUploader uploader = RequestXferUploader(transactionID); | 192 | AssetXferUploader uploader = RequestXferUploader(transactionID); |
180 | 193 | ||
194 | // Here we need to get the old asset to extract the | ||
195 | // texture UUIDs if it's a wearable. | ||
196 | if (item.AssetType == (int)AssetType.Bodypart || | ||
197 | item.AssetType == (int)AssetType.Clothing || | ||
198 | item.AssetType == (int)CustomAssetType.AnimationSet) | ||
199 | { | ||
200 | AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString()); | ||
201 | if (oldAsset != null) | ||
202 | uploader.SetOldData(oldAsset.Data); | ||
203 | } | ||
204 | |||
181 | uploader.RequestUpdateInventoryItem(remoteClient, item); | 205 | uploader.RequestUpdateInventoryItem(remoteClient, item); |
182 | } | 206 | } |
183 | } | 207 | } |
184 | } \ No newline at end of file | 208 | } |