aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs20
1 files changed, 15 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index c14e89f..bc9073e 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -41,12 +41,22 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
41{ 41{
42 public class AssetXferUploader 42 public class AssetXferUploader
43 { 43 {
44 // Viewer's notion of the default texture 44
45 private List<UUID> defaultIDs = new List<UUID> { 45 private List<UUID> defaultIDs = new List<UUID> {
46 new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), 46 // Viewer's notion of the default texture
47 new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"), 47 new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default white
48 new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"), 48 new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"), // hair
49 new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97") 49 new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"), // eyes
50 new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"), // skin
51 new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"), // transparency for alpha
52 // opensim assets skin testures possible obsolete now
53 new UUID("00000000-0000-1111-9999-000000000010"),
54 new UUID("00000000-0000-1111-9999-000000000011"),
55 new UUID("00000000-0000-1111-9999-000000000012"),
56 // other transparency defined in assets
57 new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"),
58 new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"),
59
50 }; 60 };
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 61 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 62