diff options
| author | Melanie | 2010-05-10 03:57:44 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-10 03:57:44 +0100 |
| commit | 3e8ceb350972a1d00c4163fecd8172602cdcd865 (patch) | |
| tree | 9a23412c280440ff1762999c2d93fdd2685d0196 /OpenSim/Framework | |
| parent | Fix a null ref on region crossing (diff) | |
| parent | OK, this really fixes it, I promise. (diff) | |
| download | opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.zip opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.gz opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.bz2 opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/AssetBase.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 7ecf198..53d28be 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -36,10 +36,10 @@ namespace OpenSim.Framework | |||
| 36 | [Flags] | 36 | [Flags] |
| 37 | public enum AssetFlags : int | 37 | public enum AssetFlags : int |
| 38 | { | 38 | { |
| 39 | Normal = 0, | 39 | Normal = 0, // Immutable asset |
| 40 | Maptile = 1, | 40 | Maptile = 1, // What it says |
| 41 | Rewritable = 2, | 41 | Rewritable = 2, // Content can be rewritten |
| 42 | Collectable = 4 | 42 | Collectable = 4 // Can be GC'ed after some time |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | /// <summary> | 45 | /// <summary> |