diff options
author | Diva Canto | 2010-01-15 17:24:41 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-15 17:24:41 -0800 |
commit | 32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f (patch) | |
tree | e20c1afa3edc76101eea15765a447b13b3c4946e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | Comment (diff) | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.zip opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.gz opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.bz2 opensim-SC_OLD-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 5 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 0ed7f51..7462ba0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1981,6 +1981,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1981 | 1981 | ||
1982 | return (int)pws; | 1982 | return (int)pws; |
1983 | } | 1983 | } |
1984 | |||
1984 | public void osSetSpeed(string UUID, float SpeedModifier) | 1985 | public void osSetSpeed(string UUID, float SpeedModifier) |
1985 | { | 1986 | { |
1986 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); | 1987 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); |
@@ -1988,6 +1989,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1988 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); | 1989 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); |
1989 | avatar.SpeedModifier = SpeedModifier; | 1990 | avatar.SpeedModifier = SpeedModifier; |
1990 | } | 1991 | } |
1992 | |||
1991 | public void osKickAvatar(string FirstName,string SurName,string alert) | 1993 | public void osKickAvatar(string FirstName,string SurName,string alert) |
1992 | { | 1994 | { |
1993 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 1995 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
@@ -2008,6 +2010,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2008 | } | 2010 | } |
2009 | } | 2011 | } |
2010 | } | 2012 | } |
2013 | |||
2011 | public void osCauseDamage(string avatar, double damage) | 2014 | public void osCauseDamage(string avatar, double damage) |
2012 | { | 2015 | { |
2013 | CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); | 2016 | CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); |
@@ -2035,6 +2038,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2035 | } | 2038 | } |
2036 | } | 2039 | } |
2037 | } | 2040 | } |
2041 | |||
2038 | public void osCauseHealing(string avatar, double healing) | 2042 | public void osCauseHealing(string avatar, double healing) |
2039 | { | 2043 | { |
2040 | CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); | 2044 | CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); |
@@ -2059,4 +2063,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2059 | } | 2063 | } |
2060 | } | 2064 | } |
2061 | } | 2065 | } |
2062 | } | 2066 | } \ No newline at end of file |