aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-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 b5f6721..b79c356 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 {
@@ -1972,7 +1976,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1972 { 1976 {
1973 part.UpdateRotation(rot); 1977 part.UpdateRotation(rot);
1974 // Update rotation does not move the object in the physics scene if it's a linkset. 1978 // Update rotation does not move the object in the physics scene if it's a linkset.
1975 part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 1979
1980//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type
1981// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition;
1976 } 1982 }
1977 1983
1978 /// <summary> 1984 /// <summary>
@@ -6756,15 +6762,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6756 // try to let this work as in SL... 6762 // try to let this work as in SL...
6757 if (part.ParentID == 0) 6763 if (part.ParentID == 0)
6758 { 6764 {
6759 // special case: If we are root, rotate 6765 // special case: If we are root, rotate complete SOG to new rotation
6760 // complete SOG to new rotation
6761 SetRot(part, Rot2Quaternion(q)); 6766 SetRot(part, Rot2Quaternion(q));
6762 } 6767 }
6763 else 6768 else
6764 { 6769 {
6765 // we are a child. The rotation values 6770 // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
6766 // will be set to the one of root modified
6767 // by rot, as in SL. Don't ask.
6768 SceneObjectGroup group = part.ParentGroup; 6771 SceneObjectGroup group = part.ParentGroup;
6769 if (group != null) // a bit paranoid, maybe 6772 if (group != null) // a bit paranoid, maybe
6770 { 6773 {