diff options
author | Melanie | 2011-04-08 03:50:27 +0200 |
---|---|---|
committer | Melanie | 2011-04-08 03:50:27 +0200 |
commit | 33dd74e410bcd95364d8029a3f2a21b522c9f9d2 (patch) | |
tree | 06d8a6e482ad1dd464a8f4cd292275a9878f133d /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.zip opensim-SC_OLD-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.tar.gz opensim-SC_OLD-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.tar.bz2 opensim-SC_OLD-33dd74e410bcd95364d8029a3f2a21b522c9f9d2.tar.xz |
Add support for the new display name related functions in LSL. This does not
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
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 | 20 |
2 files changed, 22 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 c31e5d3..5f94ff5 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 7c26824..63cac9a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -896,6 +896,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
896 | return m_LSL_Functions.llKey2Name(id); | 896 | return m_LSL_Functions.llKey2Name(id); |
897 | } | 897 | } |
898 | 898 | ||
899 | public LSL_String llGetUsername(string id) | ||
900 | { | ||
901 | return m_LSL_Functions.llGetUsername(id); | ||
902 | } | ||
903 | |||
904 | public LSL_String llRequestUsername(string id) | ||
905 | { | ||
906 | return m_LSL_Functions.llRequestUsername(id); | ||
907 | } | ||
908 | |||
909 | public LSL_String llGetDisplayName(string id) | ||
910 | { | ||
911 | return m_LSL_Functions.llGetDisplayName(id); | ||
912 | } | ||
913 | |||
914 | public LSL_String llRequestDisplayName(string id) | ||
915 | { | ||
916 | return m_LSL_Functions.llRequestDisplayName(id); | ||
917 | } | ||
918 | |||
899 | public void llLinkParticleSystem(int linknum, LSL_List rules) | 919 | public void llLinkParticleSystem(int linknum, LSL_List rules) |
900 | { | 920 | { |
901 | m_LSL_Functions.llLinkParticleSystem(linknum, rules); | 921 | m_LSL_Functions.llLinkParticleSystem(linknum, rules); |