diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Framework/AssetBase.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/AssetBase.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 3937d9c..33be612 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -150,12 +150,8 @@ namespace OpenSim.Framework | |||
| 150 | Type == (sbyte)AssetType.Folder || | 150 | Type == (sbyte)AssetType.Folder || |
| 151 | Type == (sbyte)AssetType.ImageJPEG || | 151 | Type == (sbyte)AssetType.ImageJPEG || |
| 152 | Type == (sbyte)AssetType.ImageTGA || | 152 | Type == (sbyte)AssetType.ImageTGA || |
| 153 | <<<<<<< HEAD | ||
| 154 | Type == (sbyte)AssetType.LSLBytecode); | ||
| 155 | ======= | ||
| 156 | Type == (sbyte)AssetType.Mesh || | 153 | Type == (sbyte)AssetType.Mesh || |
| 157 | Type == (sbyte) AssetType.LSLBytecode); | 154 | Type == (sbyte) AssetType.LSLBytecode); |
| 158 | >>>>>>> avn/ubitvar | ||
| 159 | } | 155 | } |
| 160 | } | 156 | } |
| 161 | 157 | ||