aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetBase.cs
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-11-03 21:44:39 +1000
committerDavid Walter Seikel2016-11-03 21:44:39 +1000
commit134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch)
tree216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Framework/AssetBase.cs
parentMore changing to production grid. Double oops. (diff)
downloadopensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip
opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz
opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2
opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
-rw-r--r--OpenSim/Framework/AssetBase.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index d2c6c57..2f04d2e 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -50,6 +50,9 @@ namespace OpenSim.Framework
50 { 50 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public static readonly int MAX_ASSET_NAME = 64;
54 public static readonly int MAX_ASSET_DESC = 64;
55
53 /// <summary> 56 /// <summary>
54 /// Data of the Asset 57 /// Data of the Asset
55 /// </summary> 58 /// </summary>
@@ -133,7 +136,7 @@ namespace OpenSim.Framework
133 get 136 get
134 { 137 {
135 return 138 return
136 (Type == (sbyte) AssetType.Animation || 139 (Type == (sbyte)AssetType.Animation ||
137 Type == (sbyte)AssetType.Gesture || 140 Type == (sbyte)AssetType.Gesture ||
138 Type == (sbyte)AssetType.Simstate || 141 Type == (sbyte)AssetType.Simstate ||
139 Type == (sbyte)AssetType.Unknown || 142 Type == (sbyte)AssetType.Unknown ||
@@ -143,13 +146,9 @@ namespace OpenSim.Framework
143 Type == (sbyte)AssetType.Texture || 146 Type == (sbyte)AssetType.Texture ||
144 Type == (sbyte)AssetType.TextureTGA || 147 Type == (sbyte)AssetType.TextureTGA ||
145 Type == (sbyte)AssetType.Folder || 148 Type == (sbyte)AssetType.Folder ||
146 Type == (sbyte)AssetType.RootFolder ||
147 Type == (sbyte)AssetType.LostAndFoundFolder ||
148 Type == (sbyte)AssetType.SnapshotFolder ||
149 Type == (sbyte)AssetType.TrashFolder ||
150 Type == (sbyte)AssetType.ImageJPEG || 149 Type == (sbyte)AssetType.ImageJPEG ||
151 Type == (sbyte) AssetType.ImageTGA || 150 Type == (sbyte)AssetType.ImageTGA ||
152 Type == (sbyte) AssetType.LSLBytecode); 151 Type == (sbyte)AssetType.LSLBytecode);
153 } 152 }
154 } 153 }
155 154