From 25f13f7c0130d283650e8fb088f2360cd4604835 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 29 Nov 2015 18:27:34 +0000 Subject: fix llLookAt in non-physical case --- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 38cbdbc..8d59c2d 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; } -- cgit v1.1 From fbef862aee9194344f2d654f825176bd12950335 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 30 Nov 2015 19:45:44 +0000 Subject: add a few more known texture IDs --- .../Agent/AssetTransaction/AssetXferUploader.cs | 20 +++++++++++++++----- 1 file 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 { 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 testures 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); -- cgit v1.1 From b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 30 Nov 2015 19:47:58 +0000 Subject: fix a few typos --- .../Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index bc9073e..fb6cb63 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs @@ -49,14 +49,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 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 testures possible obsolete now + // 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"), - + new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594") }; private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); -- cgit v1.1