lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'lickx' into tamai

Browse Source
This commit is contained in:
lickx
2026-02-07 06:47:39 +01:00
parent 0b8f022659 187f4da29d
commit d629a81ff7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@@ -1238,7 +1238,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
if (string.IsNullOrEmpty(homeuri.Host)) // take this as local
{
UserAccount account = m_userAccountService.GetUserAccount(UUID.Zero, firstname, lastname);
if (account != null)
if (account != null && account.PrincipalID == id)
{
oldUser.FirstName = firstname;
oldUser.LastName = lastname;

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

@@ -789,6 +789,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int CLICK_ACTION_OPEN_MEDIA = 6;
public const int CLICK_ACTION_ZOOM = 7;
public const int CLICK_ACTION_DISABLED = 8;
public const int CLICK_ACTION_IGNORE = 9;
// constants for the llDetectedTouch* functions
public const int TOUCH_INVALID_FACE = -1;