diff options
| author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
| commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
| tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/Services/Connectors/Asset | |
| parent | refactor out iar escaping (diff) | |
| parent | remove the debug stuff (diff) | |
| download | opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/Asset')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index ecda85a..8e311d7 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -243,7 +243,7 @@ namespace OpenSim.Services.Connectors | |||
| 243 | if (metadata == null) | 243 | if (metadata == null) |
| 244 | return false; | 244 | return false; |
| 245 | 245 | ||
| 246 | asset = new AssetBase(); | 246 | asset = new AssetBase(metadata.FullID, metadata.Name, metadata.Type); |
| 247 | asset.Metadata = metadata; | 247 | asset.Metadata = metadata; |
| 248 | } | 248 | } |
| 249 | asset.Data = data; | 249 | asset.Data = data; |