aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-10-29 20:17:59 +0100
committerMelanie2010-10-29 20:17:59 +0100
commite6fe83cd93691f5ecfbc00e4e140ffe98aa3ee1d (patch)
tree0da4c93e1005205668dffd9f0063175e933584c5 /OpenSim/Region
parentPreliminary work on appearance layers. No user functionality yet. (diff)
downloadopensim-SC-e6fe83cd93691f5ecfbc00e4e140ffe98aa3ee1d.zip
opensim-SC-e6fe83cd93691f5ecfbc00e4e140ffe98aa3ee1d.tar.gz
opensim-SC-e6fe83cd93691f5ecfbc00e4e140ffe98aa3ee1d.tar.bz2
opensim-SC-e6fe83cd93691f5ecfbc00e4e140ffe98aa3ee1d.tar.xz
Revert "Preliminary work on appearance layers. No user functionality yet."
This work conflicts with cmickeyb's more extensive, related work This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index efd7e22..1a13dea 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2003,14 +2003,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2003 m_host.AddScriptLPS(1); 2003 m_host.AddScriptLPS(1);
2004 2004
2005 // try to let this work as in SL... 2005 // try to let this work as in SL...
2006 if (m_host.LinkNum < 2) 2006 if (m_host.ParentID == 0)
2007 { 2007 {
2008 // Special case: If we are root, rotate complete SOG to new 2008 // special case: If we are root, rotate complete SOG to new rotation
2009 // rotation.
2010 // We are root if the link number is 0 (single prim) or 1
2011 // (root prim). ParentID may be nonzero in attachments and
2012 // using it would cause attachments and HUDs to rotate
2013 // to the wrong positions.
2014 SetRot(m_host, Rot2Quaternion(rot)); 2009 SetRot(m_host, Rot2Quaternion(rot));
2015 } 2010 }
2016 else 2011 else