aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2009-10-22 17:39:19 +0100
committerMelanie2009-10-22 17:39:19 +0100
commitfc4ff09181e1a2a9cecf1557795dce3f783966f0 (patch)
treedfc24cf5688eef7e5baff2e21359d0e1ed6a574c /OpenSim/Region/ScriptEngine
parentFixing the patch to the patch (diff)
parentMerge branch 'master' into vehicles (diff)
downloadopensim-SC_OLD-fc4ff09181e1a2a9cecf1557795dce3f783966f0.zip
opensim-SC_OLD-fc4ff09181e1a2a9cecf1557795dce3f783966f0.tar.gz
opensim-SC_OLD-fc4ff09181e1a2a9cecf1557795dce3f783966f0.tar.bz2
opensim-SC_OLD-fc4ff09181e1a2a9cecf1557795dce3f783966f0.tar.xz
Merge branch 'vehicles'
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 435b6e3..669189d 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 {
@@ -1979,7 +1983,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1979 { 1983 {
1980 part.UpdateRotation(rot); 1984 part.UpdateRotation(rot);
1981 // Update rotation does not move the object in the physics scene if it's a linkset. 1985 // Update rotation does not move the object in the physics scene if it's a linkset.
1982 part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition; 1986
1987//KF: Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type
1988// part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition;
1983 } 1989 }
1984 1990
1985 /// <summary> 1991 /// <summary>
@@ -6763,15 +6769,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6763 // try to let this work as in SL... 6769 // try to let this work as in SL...
6764 if (part.ParentID == 0) 6770 if (part.ParentID == 0)
6765 { 6771 {
6766 // special case: If we are root, rotate 6772 // special case: If we are root, rotate complete SOG to new rotation
6767 // complete SOG to new rotation
6768 SetRot(part, Rot2Quaternion(q)); 6773 SetRot(part, Rot2Quaternion(q));
6769 } 6774 }
6770 else 6775 else
6771 { 6776 {
6772 // we are a child. The rotation values 6777 // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
6773 // will be set to the one of root modified
6774 // by rot, as in SL. Don't ask.
6775 SceneObjectGroup group = part.ParentGroup; 6778 SceneObjectGroup group = part.ParentGroup;
6776 if (group != null) // a bit paranoid, maybe 6779 if (group != null) // a bit paranoid, maybe
6777 { 6780 {