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/Region/CoreModules/Agent/AssetTransaction | |
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 'OpenSim/Region/CoreModules/Agent/AssetTransaction')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 345b53d..fdff199 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -455,8 +455,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
455 | m_transactions.RemoveXferUploader(m_transactionID); | 455 | m_transactions.RemoveXferUploader(m_transactionID); |
456 | } | 456 | } |
457 | 457 | ||
458 | <<<<<<< HEAD | 458 | |
459 | ======= | ||
460 | private void ValidateAssets() | 459 | private void ValidateAssets() |
461 | { | 460 | { |
462 | if (m_asset.Type == (sbyte)CustomAssetType.AnimationSet) | 461 | if (m_asset.Type == (sbyte)CustomAssetType.AnimationSet) |
@@ -599,6 +598,5 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
599 | 598 | ||
600 | return result; | 599 | return result; |
601 | } | 600 | } |
602 | >>>>>>> avn/ubitvar | ||
603 | } | 601 | } |
604 | } | 602 | } |