aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 95713e9..d52ebda 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -439,7 +439,7 @@ namespace OpenSim.Region.ClientStack.Linden
439 } 439 }
440 440
441 /// <summary> 441 /// <summary>
442 /// 442 /// Convert raw uploaded data into the appropriate asset and item.
443 /// </summary> 443 /// </summary>
444 /// <param name="assetID"></param> 444 /// <param name="assetID"></param>
445 /// <param name="inventoryItem"></param> 445 /// <param name="inventoryItem"></param>
@@ -506,8 +506,6 @@ namespace OpenSim.Region.ClientStack.Linden
506 } 506 }
507 } 507 }
508 508
509
510
511 /// <summary> 509 /// <summary>
512 /// 510 ///
513 /// </summary> 511 /// </summary>
@@ -632,7 +630,7 @@ namespace OpenSim.Region.ClientStack.Linden
632 } 630 }
633 631
634 /// <summary> 632 /// <summary>
635 /// 633 /// Handle raw asset upload data via the capability.
636 /// </summary> 634 /// </summary>
637 /// <param name="data"></param> 635 /// <param name="data"></param>
638 /// <param name="path"></param> 636 /// <param name="path"></param>
@@ -670,6 +668,7 @@ namespace OpenSim.Region.ClientStack.Linden
670 668
671 return res; 669 return res;
672 } 670 }
671
673 ///Left this in and commented in case there are unforseen issues 672 ///Left this in and commented in case there are unforseen issues
674 //private void SaveAssetToFile(string filename, byte[] data) 673 //private void SaveAssetToFile(string filename, byte[] data)
675 //{ 674 //{
@@ -679,6 +678,7 @@ namespace OpenSim.Region.ClientStack.Linden
679 // bw.Close(); 678 // bw.Close();
680 // fs.Close(); 679 // fs.Close();
681 //} 680 //}
681
682 private static void SaveAssetToFile(string filename, byte[] data) 682 private static void SaveAssetToFile(string filename, byte[] data)
683 { 683 {
684 string assetPath = "UserAssets"; 684 string assetPath = "UserAssets";
@@ -719,7 +719,7 @@ namespace OpenSim.Region.ClientStack.Linden
719 } 719 }
720 720
721 /// <summary> 721 /// <summary>
722 /// 722 /// Handle raw uploaded asset data.
723 /// </summary> 723 /// </summary>
724 /// <param name="data"></param> 724 /// <param name="data"></param>
725 /// <param name="path"></param> 725 /// <param name="path"></param>
@@ -752,6 +752,7 @@ namespace OpenSim.Region.ClientStack.Linden
752 752
753 return res; 753 return res;
754 } 754 }
755
755 ///Left this in and commented in case there are unforseen issues 756 ///Left this in and commented in case there are unforseen issues
756 //private void SaveAssetToFile(string filename, byte[] data) 757 //private void SaveAssetToFile(string filename, byte[] data)
757 //{ 758 //{
@@ -761,6 +762,7 @@ namespace OpenSim.Region.ClientStack.Linden
761 // bw.Close(); 762 // bw.Close();
762 // fs.Close(); 763 // fs.Close();
763 //} 764 //}
765
764 private static void SaveAssetToFile(string filename, byte[] data) 766 private static void SaveAssetToFile(string filename, byte[] data)
765 { 767 {
766 string assetPath = "UserAssets"; 768 string assetPath = "UserAssets";
@@ -905,7 +907,7 @@ namespace OpenSim.Region.ClientStack.Linden
905 } 907 }
906 908
907 /// <summary> 909 /// <summary>
908 /// 910 /// Handle raw uploaded baked texture data.
909 /// </summary> 911 /// </summary>
910 /// <param name="data"></param> 912 /// <param name="data"></param>
911 /// <param name="path"></param> 913 /// <param name="path"></param>