aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorubit2012-09-26 22:04:27 +0200
committerubit2012-09-26 22:04:27 +0200
commit810e24af49d1e8e2b4e6c8e10a60f9b5063e3d94 (patch)
tree5ddd22d4fccfa6f73f60a71c9ac740e6e1aca344 /OpenSim/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent don't send a partial contents report if we are sending all data (diff)
downloadopensim-SC-810e24af49d1e8e2b4e6c8e10a60f9b5063e3d94.zip
opensim-SC-810e24af49d1e8e2b4e6c8e10a60f9b5063e3d94.tar.gz
opensim-SC-810e24af49d1e8e2b4e6c8e10a60f9b5063e3d94.tar.bz2
opensim-SC-810e24af49d1e8e2b4e6c8e10a60f9b5063e3d94.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AssetBase.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index ff240be..5da8e11 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -150,7 +150,8 @@ namespace OpenSim.Framework
150 Type == (sbyte)AssetType.SnapshotFolder || 150 Type == (sbyte)AssetType.SnapshotFolder ||
151 Type == (sbyte)AssetType.TrashFolder || 151 Type == (sbyte)AssetType.TrashFolder ||
152 Type == (sbyte)AssetType.ImageJPEG || 152 Type == (sbyte)AssetType.ImageJPEG ||
153 Type == (sbyte) AssetType.ImageTGA || 153 Type == (sbyte)AssetType.ImageTGA ||
154 Type == (sbyte)AssetType.Mesh ||
154 Type == (sbyte) AssetType.LSLBytecode); 155 Type == (sbyte) AssetType.LSLBytecode);
155 } 156 }
156 } 157 }