ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve lldialog and lltextbox owner processing (still bad)

Browse Source
This commit is contained in:
UbitUmarov
2022-06-19 12:29:41 +01:00
parent 40b9ea6638
commit cfa3487b4f
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View File

@@ -131,24 +131,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
private void GetOwnerName(UUID ownerID, out string ownerFirstName, out string ownerLastName)
{
ownerFirstName = string.Empty;
ownerLastName = string.Empty;
string username = m_scene.UserManagementModule.GetUserName(ownerID);
if (!string.IsNullOrEmpty(username) && !username.StartsWith("UnknownUMM2", StringComparison.InvariantCulture))
{
string[] parts = username.Split(' ');
ownerFirstName = parts[0];
if (parts.Length > 1)
ownerLastName = parts[1];
}
else
if(!m_scene.UserManagementModule.GetUserName(ownerID, out ownerFirstName, out ownerLastName))
{
IGroupsModule groups = m_scene.RequestModuleInterface<IGroupsModule>();
if (groups != null)
{
GroupRecord grprec = groups.GetGroupRecord(ownerID);
if (grprec != null && !string.IsNullOrEmpty(grprec.GroupName))
ownerFirstName = grprec.GroupName;
{
ownerLastName = grprec.GroupName;
return;
}
}
}
if(string.IsNullOrEmpty(ownerFirstName))
@@ -162,13 +155,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
UUID objectID, UUID ownerID, string message, UUID textureID,
int ch, string[] buttonlabels)
{
ScenePresence sp = m_scene.GetScenePresence(avatarID);
if (sp != null)
{
string ownerFirstName;
string ownerLastName;
GetOwnerName(ownerID, out ownerFirstName, out ownerLastName);
GetOwnerName(ownerID, out string ownerFirstName, out string ownerLastName);
sp.ControllingClient.SendDialog(objectName, objectID, ownerID,
ownerFirstName, ownerLastName, message, textureID, ch,
@@ -194,9 +184,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
ScenePresence sp = m_scene.GetScenePresence(avatarid);
if (sp != null)
{
string ownerFirstName;
string ownerLastName;
GetOwnerName(ownerID, out ownerFirstName, out ownerLastName);
GetOwnerName(ownerID, out string ownerFirstName, out string ownerLastName);
sp.ControllingClient.SendTextBoxRequest(message, chatChannel,
name, ownerID, ownerFirstName, ownerLastName,