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/Framework/Capabilities/Caps.cs | |
| parent | refactor out iar escaping (diff) | |
| parent | remove the debug stuff (diff) | |
| download | opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Capabilities/Caps.cs')
| -rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index ccfe800..72231ca 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
| @@ -888,10 +888,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 888 | } | 888 | } |
| 889 | 889 | ||
| 890 | AssetBase asset; | 890 | AssetBase asset; |
| 891 | asset = new AssetBase(); | 891 | asset = new AssetBase(assetID, assetName, assType); |
| 892 | asset.FullID = assetID; | ||
| 893 | asset.Type = assType; | ||
| 894 | asset.Name = assetName; | ||
| 895 | asset.Data = data; | 892 | asset.Data = data; |
| 896 | if (AddNewAsset != null) | 893 | if (AddNewAsset != null) |
| 897 | AddNewAsset(asset); | 894 | AddNewAsset(asset); |