ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 14:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

change llName2Key and add llRequestUserKey (not the patch on mantis 8369, now utdated). some testing needed..

Browse Source
This commit is contained in:
UbitUmarov
2020-08-16 20:00:42 +01:00
parent 15f0b1190a
commit 421cc0c018
6 changed files with 201 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6855,7 +6855,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (presence != null)
{
return presence.ControllingClient.Name;
return presence.Name;
//return presence.Name;
}
@@ -6874,22 +6874,119 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(string.IsNullOrWhiteSpace(name))
return ScriptBaseClass.NULL_KEY;
int nc = Util.ParseAvatarName(name, out string firstName, out string lastName, out string server);
if (nc < 2)
return ScriptBaseClass.NULL_KEY;
string sname;
if (nc == 2)
sname = firstName + " " + lastName;
else
sname = firstName + "." + lastName + " @" + server;
foreach (ScenePresence sp in World.GetScenePresences())
{
if (sp.IsDeleted || sp.IsChildAgent)
continue;
string test = sp.ControllingClient.Name;
if (!name.Contains(" "))
test = test.Replace(" ", ".");
if (String.Compare(name, test, true) == 0)
if (String.Compare(sname, sp.Name, true) == 0)
return sp.UUID.ToString();
}
return ScriptBaseClass.NULL_KEY;
}
public LSL_Key llRequestUserKey(LSL_String username)
{
m_host.AddScriptLPS(1);
if (string.IsNullOrWhiteSpace(username))
return ScriptBaseClass.NULL_KEY;
int nc = Util.ParseAvatarName(username, out string firstName, out string lastName, out string server);
if (nc < 2)
return ScriptBaseClass.NULL_KEY;
string sname;
if (nc == 2)
sname = firstName + " " + lastName;
else
sname = firstName + "." + lastName + " @" + server;
foreach (ScenePresence sp in World.GetScenePresences())
{
if (sp.IsDeleted || sp.IsChildAgent)
continue;
if (String.Compare(sname, sp.Name, true) == 0)
{
string ftid = m_AsyncCommands.DataserverPlugin.RequestWithImediatePost(m_host.LocalId,
m_item.ItemID, sp.UUID.ToString());
return ftid;
}
}
Action<string> act = eventID =>
{
string reply = ScriptBaseClass.NULL_KEY;
UUID userID = UUID.Zero;
IUserManagement userManager = World.RequestModuleInterface<IUserManagement>();
if (nc == 2)
{
if (userManager != null)
{
userID = userManager.GetUserIdByName(firstName, lastName);
if (userID != UUID.Zero)
reply = userID.ToString();
}
}
else
{
string url = "http://" + server;
if (Uri.TryCreate(url, UriKind.Absolute, out Uri dummy))
{
bool notfound = true;
if (userManager != null)
{
string hgfirst = firstName + "." + lastName;
string hglast = "@" + server;
userID = userManager.GetUserIdByName(hgfirst, hglast);
if (userID != UUID.Zero)
{
notfound = false;
reply = userID.ToString();
}
}
if(notfound)
{
try
{
UserAgentServiceConnector userConnection = new UserAgentServiceConnector(url);
if (userConnection != null)
{
userID = userConnection.GetUUID(firstName, lastName);
if (userID != UUID.Zero)
{
if (userManager != null)
userManager.AddUser(userID, firstName, lastName, url);
reply = userID.ToString();
}
}
}
catch
{
reply = ScriptBaseClass.NULL_KEY;
}
}
}
}
m_AsyncCommands.DataserverPlugin.DataserverReply(eventID, reply);
};
UUID tid = m_AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, act);
ScriptSleep(m_sleepMsOnRequestAgentData);
return tid.ToString();
}
public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate)
{
m_host.AddScriptLPS(1);
@@ -15268,6 +15365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
};
UUID rq = m_AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, act);
ScriptSleep(m_sleepMsOnRequestAgentData);
return rq.ToString();
}

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

@@ -308,6 +308,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llRemoveFromLandPassList(string avatar);
void llRemoveInventory(string item);
void llRemoveVehicleFlags(int flags);
LSL_Key llRequestUserKey(LSL_String username);
LSL_Key llRequestAgentData(string id, int data);
LSL_Key llRequestInventoryData(LSL_String name);
void llRequestPermissions(string agent, int perm);

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public partial class ScriptBaseClass
{
// SCRIPTS CONSTANTS
public static readonly LSLInteger OS_APIVERSION = 14;
public static readonly LSLInteger OS_APIVERSION = 15;
public static readonly LSLInteger TRUE = 1;
public static readonly LSLInteger FALSE = 0;

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

@@ -1336,6 +1336,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_LSL_Functions.llRemoveVehicleFlags(flags);
}
public LSL_Key llRequestUserKey(LSL_String username)
{
return m_LSL_Functions.llRequestUserKey(username);
}
public LSL_Key llRequestAgentData(string id, int data)
{
return m_LSL_Functions.llRequestAgentData(id, data);