diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 23:35:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 23:35:59 +0000 |
| commit | dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a (patch) | |
| tree | 60020a679a229d078ce3be2f933025c81c677d74 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | Amend to last commit: synchronize access to queues. (diff) | |
| parent | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:... (diff) | |
| download | opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.zip opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.gz opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.bz2 opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c55e2ae..ff1f5fd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2740,7 +2740,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2740 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); | 2740 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); |
| 2741 | m_host.AddScriptLPS(1); | 2741 | m_host.AddScriptLPS(1); |
| 2742 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); | 2742 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); |
| 2743 | avatar.SpeedModifier = (float)SpeedModifier; | 2743 | |
| 2744 | if (avatar != null) | ||
| 2745 | avatar.SpeedModifier = (float)SpeedModifier; | ||
| 2744 | } | 2746 | } |
| 2745 | 2747 | ||
| 2746 | public void osKickAvatar(string FirstName,string SurName,string alert) | 2748 | public void osKickAvatar(string FirstName,string SurName,string alert) |