diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index b3c4d95..9377cda 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -50,6 +50,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
50 | public const int STATUS_CAST_SHADOWS = 512; | 50 | public const int STATUS_CAST_SHADOWS = 512; |
51 | 51 | ||
52 | public const int AGENT = 1; | 52 | public const int AGENT = 1; |
53 | public const int AGENT_BY_LEGACY_NAME = 1; | ||
54 | public const int AGENT_BY_USERNAME = 0x10; | ||
53 | public const int ACTIVE = 2; | 55 | public const int ACTIVE = 2; |
54 | public const int PASSIVE = 4; | 56 | public const int PASSIVE = 4; |
55 | public const int SCRIPTED = 8; | 57 | public const int SCRIPTED = 8; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 451163f..303d75e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -894,6 +894,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
894 | return m_LSL_Functions.llKey2Name(id); | 894 | return m_LSL_Functions.llKey2Name(id); |
895 | } | 895 | } |
896 | 896 | ||
897 | public LSL_String llGetUsername(string id) | ||
898 | { | ||
899 | return m_LSL_Functions.llGetUsername(id); | ||
900 | } | ||
901 | |||
902 | public LSL_String llRequestUsername(string id) | ||
903 | { | ||
904 | return m_LSL_Functions.llRequestUsername(id); | ||
905 | } | ||
906 | |||
907 | public LSL_String llGetDisplayName(string id) | ||
908 | { | ||
909 | return m_LSL_Functions.llGetDisplayName(id); | ||
910 | } | ||
911 | |||
912 | public LSL_String llRequestDisplayName(string id) | ||
913 | { | ||
914 | return m_LSL_Functions.llRequestDisplayName(id); | ||
915 | } | ||
916 | |||
897 | public void llLinkParticleSystem(int linknum, LSL_List rules) | 917 | public void llLinkParticleSystem(int linknum, LSL_List rules) |
898 | { | 918 | { |
899 | m_LSL_Functions.llLinkParticleSystem(linknum, rules); | 919 | m_LSL_Functions.llLinkParticleSystem(linknum, rules); |
@@ -1847,5 +1867,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1847 | { | 1867 | { |
1848 | return m_LSL_Functions.llClearPrimMedia(face); | 1868 | return m_LSL_Functions.llClearPrimMedia(face); |
1849 | } | 1869 | } |
1870 | |||
1871 | public void print(string str) | ||
1872 | { | ||
1873 | m_LSL_Functions.print(str); | ||
1874 | } | ||
1850 | } | 1875 | } |
1851 | } | 1876 | } |