aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-05-10 04:05:04 +0100
committerMelanie2010-05-10 04:05:04 +0100
commitfada4cb6c483c34a286792a92eeab1bd289dd76c (patch)
tree55d97abbdee19360d3fc8a0546e4315d4a0f096d /OpenSim/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentReturn agents when angle is PI (diff)
downloadopensim-SC-fada4cb6c483c34a286792a92eeab1bd289dd76c.zip
opensim-SC-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.gz
opensim-SC-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.bz2
opensim-SC-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AssetBase.cs8
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>