OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ScriptDistanceLimitFactor to OpenSim.ini to allow modifcation of 

LSL's arbitrary 10 m limit on object movement.
Also implements the 10 m maximum rezzing distance, subhect to the same
factor.
0.6.0-stable
Melanie Thielker 2008-08-27 17:12:55 +00:00
parent 36d1720fde
commit 1ac6bb3107
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -78,6 +78,7 @@ namespace OpenSim.Region.ScriptEngine.Common
config.AddConfig("LL-Functions"); config.AddConfig("LL-Functions");
m_delayFactor = config.Configs["LL-Functions"].GetFloat("ScriptDelayFactor", 1.0f); m_delayFactor = config.Configs["LL-Functions"].GetFloat("ScriptDelayFactor", 1.0f);
m_distanceFactor = config.Configs["LL-Functions"].GetFloat("ScriptDistanceLimitFactor", 1.0f);
} }
@ -85,6 +86,7 @@ namespace OpenSim.Region.ScriptEngine.Common
private string m_state = "default"; private string m_state = "default";
private bool m_waitingForScriptAnswer=false; private bool m_waitingForScriptAnswer=false;
private float m_delayFactor = 1.0f; private float m_delayFactor = 1.0f;
private float m_distanceFactor = 1.0f;
private void ScriptSleep(int delay) private void ScriptSleep(int delay)
@ -1658,7 +1660,7 @@ namespace OpenSim.Region.ScriptEngine.Common
LSL_Types.Vector3 currentPos = llGetLocalPos(); LSL_Types.Vector3 currentPos = llGetLocalPos();
if (llVecDist(currentPos, targetPos) > 10) if (llVecDist(currentPos, targetPos) > 10)
{ {
targetPos = currentPos + 10 * llVecNorm(targetPos - currentPos); targetPos = currentPos + m_distanceFactor * 10.0f * llVecNorm(targetPos - currentPos);
} }
if (part.ParentID != 0) if (part.ParentID != 0)
@ -2293,6 +2295,10 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
bool found = false; bool found = false;
float dist = (float)llVecDist(llGetPos(), pos);
if(dist > m_distanceFactor * 10.0f)
return;
// Instead of using return;, I'm using continue; because in our TaskInventory implementation // Instead of using return;, I'm using continue; because in our TaskInventory implementation
// it's possible to have two items with the same task inventory name. // it's possible to have two items with the same task inventory name.
// this is an easter egg of sorts. // this is an easter egg of sorts.

1
bin/OpenSim.ini.example
View File

@ -529,6 +529,7 @@ AllowosConsoleCommand=false
AllowGodFunctions = false AllowGodFunctions = false
ScriptDelayFactor = 1.0 ScriptDelayFactor = 1.0
ScriptDistanceLimitFactor = 1.0
; Maximum number of llListen events we allow per script ; Maximum number of llListen events we allow per script
; Set this to 0 to have no limit imposed. ; Set this to 0 to have no limit imposed.