diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index c14e89fb7c..fb6cb63ca6 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs @@ -41,12 +41,21 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { public class AssetXferUploader { - // Viewer's notion of the default texture + private List defaultIDs = new List { - new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), - new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"), - new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"), - new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97") + // Viewer's notion of the default texture + new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default white + new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"), // hair + new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"), // eyes + new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"), // skin + new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"), // transparency for alpha + // opensim assets skin textures possible obsolete now + new UUID("00000000-0000-1111-9999-000000000010"), + new UUID("00000000-0000-1111-9999-000000000011"), + new UUID("00000000-0000-1111-9999-000000000012"), + // other transparency defined in assets + new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"), + new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594") }; private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 38cbdbc9a4..8d59c2d289 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -3575,13 +3575,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (strength <= 0.0 || damping <= 0.0) return; - llSetRot(rot); + llSetLocalRot(rot); } else { if (strength == 0) { - llSetRot(rot); + llSetLocalRot(rot); return; }