OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a few changes to last commit

0.9.1.0-post-fixes
UbitUmarov 2018-10-23 18:55:26 +01:00
parent 06a35b9559
commit c643b4236f
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6844,28 +6844,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return String.Empty; return String.Empty;
} }
public LSL_Key llName2Key(string name) public LSL_Key llName2Key(LSL_String name)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
foreach (ScenePresence sp in World.GetScenePresences()) foreach (ScenePresence sp in World.GetScenePresences())
{ {
if (sp.IsDeleted || sp.IsChildAgent)
continue;
string test = sp.ControllingClient.Name; string test = sp.ControllingClient.Name;
if (!name.Contains(" ")) if (!name.Contains(" "))
test = test.Replace(" ", "."); test = test.Replace(" ", ".");
if (String.Compare(name, test, true) == 0) if (String.Compare(name, test, true) == 0)
{ return sp.UUID.ToString();
if (!sp.IsNPC)
return sp.UUID.ToString();
}
} }
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);

12
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@ -225,13 +225,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llInstantMessage(string user, string message); void llInstantMessage(string user, string message);
LSL_String llIntegerToBase64(int number); LSL_String llIntegerToBase64(int number);
LSL_String llKey2Name(string id); LSL_String llKey2Name(string id);
LSL_Key llName2Key(string name);
LSL_String llGetUsername(string id); LSL_String llGetUsername(string id);
LSL_Key llRequestUsername(string id); LSL_Key llRequestUsername(string id);
LSL_String llGetDisplayName(string id); LSL_String llGetDisplayName(string id);
LSL_Key llRequestDisplayName(string id); LSL_Key llRequestDisplayName(string id);
void llLinkParticleSystem(int linknum, LSL_List rules); void llLinkParticleSystem(int linknum, LSL_List rules);
void llLinkSitTarget(LSL_Integer link, LSL_Vector offset, LSL_Rotation rot); void llLinkSitTarget(LSL_Integer link, LSL_Vector offset, LSL_Rotation rot);
LSL_String llList2CSV(LSL_List src); LSL_String llList2CSV(LSL_List src);
LSL_Float llList2Float(LSL_List src, int index); LSL_Float llList2Float(LSL_List src, int index);
LSL_Integer llList2Integer(LSL_List src, int index); LSL_Integer llList2Integer(LSL_List src, int index);
@ -263,13 +262,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset); void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset);
void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at); void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at);
LSL_String llMD5String(string src, int nonce); LSL_String llMD5String(string src, int nonce);
LSL_String llSHA1String(string src); LSL_String llSHA1String(string src);
void llMessageLinked(int linknum, int num, string str, string id); void llMessageLinked(int linknum, int num, string str, string id);
void llMinEventDelay(double delay); void llMinEventDelay(double delay);
void llModifyLand(int action, int brush); void llModifyLand(int action, int brush);
LSL_Integer llModPow(int a, int b, int c); LSL_Integer llModPow(int a, int b, int c);
void llMoveToTarget(LSL_Vector target, double tau); void llMoveToTarget(LSL_Vector target, double tau);
LSL_Key llName2Key(LSL_String name);
void llOffsetTexture(double u, double v, int face); void llOffsetTexture(double u, double v, int face);
void llOpenRemoteDataChannel(); void llOpenRemoteDataChannel();
LSL_Integer llOverMyLand(string id); LSL_Integer llOverMyLand(string id);
@ -442,7 +442,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llSetKeyframedMotion(LSL_List frames, LSL_List options); void llSetKeyframedMotion(LSL_List frames, LSL_List options);
LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
LSL_List llGetPhysicsMaterial(); LSL_List llGetPhysicsMaterial();
void llSetAnimationOverride(LSL_String animState, LSL_String anim); void llSetAnimationOverride(LSL_String animState, LSL_String anim);
void llResetAnimationOverride(LSL_String anim_state); void llResetAnimationOverride(LSL_String anim_state);
LSL_String llGetAnimationOverride(LSL_String anim_state); LSL_String llGetAnimationOverride(LSL_String anim_state);
LSL_String llJsonGetValue(LSL_String json, LSL_List specifiers); LSL_String llJsonGetValue(LSL_String json, LSL_List specifiers);

10
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@ -961,11 +961,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_LSL_Functions.llKey2Name(id); return m_LSL_Functions.llKey2Name(id);
} }
public LSL_Key llName2Key(string name)
{
return m_LSL_Functions.llName2Key(name);
}
public LSL_String llGetUsername(string id) public LSL_String llGetUsername(string id)
{ {
return m_LSL_Functions.llGetUsername(id); return m_LSL_Functions.llGetUsername(id);
@ -1186,6 +1181,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_LSL_Functions.llMoveToTarget(target, tau); m_LSL_Functions.llMoveToTarget(target, tau);
} }
public LSL_Key llName2Key(LSL_String name)
{
return m_LSL_Functions.llName2Key(name);
}
public void llOffsetTexture(double u, double v, int face) public void llOffsetTexture(double u, double v, int face)
{ {
m_LSL_Functions.llOffsetTexture(u, v, face); m_LSL_Functions.llOffsetTexture(u, v, face);