diff options
| author | UbitUmarov | 2015-12-04 17:34:49 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-12-04 17:34:49 +0000 |
| commit | 0d8f62405c6e0ed4f8e0c48e5076f763e6787310 (patch) | |
| tree | b29e3df068a3e51ee6de0e6f416baa8018810ba6 /OpenSim | |
| parent | change handling of optional skirt baked texture (diff) | |
| download | opensim-SC-0d8f62405c6e0ed4f8e0c48e5076f763e6787310.zip opensim-SC-0d8f62405c6e0ed4f8e0c48e5076f763e6787310.tar.gz opensim-SC-0d8f62405c6e0ed4f8e0c48e5076f763e6787310.tar.bz2 opensim-SC-0d8f62405c6e0ed4f8e0c48e5076f763e6787310.tar.xz | |
add other Eyes asset id to xferupload defaults
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 7bd7618..d2794f9 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
| @@ -49,13 +49,15 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
| 49 | new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"), // eyes | 49 | new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"), // eyes |
| 50 | new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"), // skin | 50 | new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"), // skin |
| 51 | new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"), // transparency for alpha | 51 | new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"), // transparency for alpha |
| 52 | // opensim assets skin textures possibly obsolete now | 52 | // opensim assets textures possibly obsolete now |
| 53 | new UUID("00000000-0000-1111-9999-000000000010"), | 53 | new UUID("00000000-0000-1111-9999-000000000010"), |
| 54 | new UUID("00000000-0000-1111-9999-000000000011"), | 54 | new UUID("00000000-0000-1111-9999-000000000011"), |
| 55 | new UUID("00000000-0000-1111-9999-000000000012"), | 55 | new UUID("00000000-0000-1111-9999-000000000012"), |
| 56 | // other transparency defined in assets | 56 | // other transparency defined in assets |
| 57 | new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"), | 57 | new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"), |
| 58 | new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594") | 58 | new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594"), |
| 59 | |||
| 60 | new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7") // other eyes | ||
| 59 | }; | 61 | }; |
| 60 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 62 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 61 | 63 | ||