Merge branch 'master' of /home/git/repo/OpenSim

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
         public const int STATUS_CAST_SHADOWS = 512;
 
         public const int AGENT = 1;
+        public const int AGENT_BY_LEGACY_NAME = 1;
+        public const int AGENT_BY_USERNAME = 0x10;
         public const int ACTIVE = 2;
         public const int PASSIVE = 4;
         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
             return m_LSL_Functions.llKey2Name(id);
         }
 
+        public LSL_String llGetUsername(string id)
+        {
+            return m_LSL_Functions.llGetUsername(id);
+        }
+
+        public LSL_String llRequestUsername(string id)
+        {
+            return m_LSL_Functions.llRequestUsername(id);
+        }
+
+        public LSL_String llGetDisplayName(string id)
+        {
+            return m_LSL_Functions.llGetDisplayName(id);
+        }
+
+        public LSL_String llRequestDisplayName(string id)
+        {
+            return m_LSL_Functions.llRequestDisplayName(id);
+        }
+
         public void llLinkParticleSystem(int linknum, LSL_List rules)
         {
             m_LSL_Functions.llLinkParticleSystem(linknum, rules);
@@ -1847,5 +1867,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LSL_Functions.llClearPrimMedia(face);
         }
+
+        public void print(string str)
+        {
+            m_LSL_Functions.print(str);
+        }
     }
 }