aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs31
1 files changed, 17 insertions, 14 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e10e612..7c176bb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -99,17 +99,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
99 m_localID = localID; 99 m_localID = localID;
100 m_itemID = itemID; 100 m_itemID = itemID;
101 101
102 m_ScriptDelayFactor = m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); 102 m_ScriptDelayFactor =
103 m_ScriptDistanceFactor = m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); 103 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
104 m_MinTimerInterval = m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f); 104 m_ScriptDistanceFactor =
105 m_automaticLinkPermission = m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false); 105 m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f);
106 m_scriptConsoleChannel = m_ScriptEngine.Config.GetInt("ScriptConsoleChannel", 0); 106 m_MinTimerInterval =
107 m_scriptConsoleChannelEnabled = (m_scriptConsoleChannel != 0); 107 m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f);
108 m_notecardLineReadCharsMax = m_ScriptEngine.Config.GetInt("NotecardLineReadCharsMax", 255); 108 m_automaticLinkPermission =
109 m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false);
110 m_notecardLineReadCharsMax =
111 m_ScriptEngine.Config.GetInt("NotecardLineReadCharsMax", 255);
109 if (m_notecardLineReadCharsMax > 65535) 112 if (m_notecardLineReadCharsMax > 65535)
110 m_notecardLineReadCharsMax = 65535; 113 m_notecardLineReadCharsMax = 65535;
111 114
112 m_TransferModule = m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>(); 115 m_TransferModule =
116 m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>();
113 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 117 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
114 if (m_UrlModule != null) 118 if (m_UrlModule != null)
115 { 119 {
@@ -1982,7 +1986,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1982 { 1986 {
1983 part.UpdateRotation(rot); 1987 part.UpdateRotation(rot);
1984 // Update rotation does not move the object in the physics scene if it's a linkset. 1988 // Update rotation does not move the object in the physics scene if it's a linkset.
1985 part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 1989
1990//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type
1991// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition;
1986 } 1992 }
1987 1993
1988 /// <summary> 1994 /// <summary>
@@ -6766,15 +6772,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6766 // try to let this work as in SL... 6772 // try to let this work as in SL...
6767 if (part.ParentID == 0) 6773 if (part.ParentID == 0)
6768 { 6774 {
6769 // special case: If we are root, rotate 6775 // special case: If we are root, rotate complete SOG to new rotation
6770 // complete SOG to new rotation
6771 SetRot(part, Rot2Quaternion(q)); 6776 SetRot(part, Rot2Quaternion(q));
6772 } 6777 }
6773 else 6778 else
6774 { 6779 {
6775 // we are a child. The rotation values 6780 // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
6776 // will be set to the one of root modified
6777 // by rot, as in SL. Don't ask.
6778 SceneObjectGroup group = part.ParentGroup; 6781 SceneObjectGroup group = part.ParentGroup;
6779 if (group != null) // a bit paranoid, maybe 6782 if (group != null) // a bit paranoid, maybe
6780 { 6783 {