diff options
| author | Melanie | 2009-11-06 10:33:49 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-06 10:33:49 +0000 |
| commit | 5300e8506da657118dbde8c9edc9a00db28bc4ac (patch) | |
| tree | 780597557f006bff730869955a0902fb54f50f43 | |
| parent | Fixing the build break (diff) | |
| download | opensim-SC-5300e8506da657118dbde8c9edc9a00db28bc4ac.zip opensim-SC-5300e8506da657118dbde8c9edc9a00db28bc4ac.tar.gz opensim-SC-5300e8506da657118dbde8c9edc9a00db28bc4ac.tar.bz2 opensim-SC-5300e8506da657118dbde8c9edc9a00db28bc4ac.tar.xz | |
Reintroduce AssetBase's old behavior. A Parameterless constructor is required
for .NET serialization and removing it breaks the OpenSim asset server
protocol.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/AssetBase.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index eed9703..212f41d 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -51,6 +51,16 @@ namespace OpenSim.Framework | |||
| 51 | /// </summary> | 51 | /// </summary> |
| 52 | private AssetMetadata m_metadata; | 52 | private AssetMetadata m_metadata; |
| 53 | 53 | ||
| 54 | // This is needed for .NET serialization!!! | ||
| 55 | // Do NOT "Optimize" away! | ||
| 56 | public AssetBase() | ||
| 57 | { | ||
| 58 | m_metadata = new AssetMetadata(); | ||
| 59 | m_metadata.FullID = UUID.Zero; | ||
| 60 | m_metadata.ID = UUID.Zero.ToString(); | ||
| 61 | m_metadata.Type = (sbyte)AssetType.Unknown; | ||
| 62 | } | ||
| 63 | |||
| 54 | public AssetBase(UUID assetID, string name, sbyte assetType) | 64 | public AssetBase(UUID assetID, string name, sbyte assetType) |
| 55 | { | 65 | { |
| 56 | if (assetType == (sbyte)AssetType.Unknown) | 66 | if (assetType == (sbyte)AssetType.Unknown) |