aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
Diffstat (limited to '')
-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 02be983..edcf11c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -96,17 +96,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
96 m_localID = localID; 96 m_localID = localID;
97 m_itemID = itemID; 97 m_itemID = itemID;
98 98
99 m_ScriptDelayFactor = m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); 99 m_ScriptDelayFactor =
100 m_ScriptDistanceFactor = m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); 100 m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
101 m_MinTimerInterval = m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f); 101 m_ScriptDistanceFactor =
102 m_automaticLinkPermission = m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false); 102 m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f);
103 m_scriptConsoleChannel = m_ScriptEngine.Config.GetInt("ScriptConsoleChannel", 0); 103 m_MinTimerInterval =
104 m_scriptConsoleChannelEnabled = (m_scriptConsoleChannel != 0); 104 m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f);
105 m_notecardLineReadCharsMax = m_ScriptEngine.Config.GetInt("NotecardLineReadCharsMax", 255); 105 m_automaticLinkPermission =
106 m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false);
107 m_notecardLineReadCharsMax =
108 m_ScriptEngine.Config.GetInt("NotecardLineReadCharsMax", 255);
106 if (m_notecardLineReadCharsMax > 65535) 109 if (m_notecardLineReadCharsMax > 65535)
107 m_notecardLineReadCharsMax = 65535; 110 m_notecardLineReadCharsMax = 65535;
108 111
109 m_TransferModule = m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>(); 112 m_TransferModule =
113 m_ScriptEngine.World.RequestModuleInterface<IMessageTransferModule>();
110 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); 114 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
111 if (m_UrlModule != null) 115 if (m_UrlModule != null)
112 { 116 {
@@ -1969,7 +1973,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1969 { 1973 {
1970 part.UpdateRotation(rot); 1974 part.UpdateRotation(rot);
1971 // Update rotation does not move the object in the physics scene if it's a linkset. 1975 // Update rotation does not move the object in the physics scene if it's a linkset.
1972 part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 1976
1977//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type
1978// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition;
1973 } 1979 }
1974 1980
1975 /// <summary> 1981 /// <summary>
@@ -6747,15 +6753,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6747 // try to let this work as in SL... 6753 // try to let this work as in SL...
6748 if (part.ParentID == 0) 6754 if (part.ParentID == 0)
6749 { 6755 {
6750 // special case: If we are root, rotate 6756 // special case: If we are root, rotate complete SOG to new rotation
6751 // complete SOG to new rotation
6752 SetRot(part, Rot2Quaternion(q)); 6757 SetRot(part, Rot2Quaternion(q));
6753 } 6758 }
6754 else 6759 else
6755 { 6760 {
6756 // we are a child. The rotation values 6761 // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
6757 // will be set to the one of root modified
6758 // by rot, as in SL. Don't ask.
6759 SceneObjectGroup group = part.ParentGroup; 6762 SceneObjectGroup group = part.ParentGroup;
6760 if (group != null) // a bit paranoid, maybe 6763 if (group != null) // a bit paranoid, maybe
6761 { 6764 {