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

split usermanagement adduser into simpler per case methods

Browse Source
This commit is contained in:
UbitUmarov
2020-11-26 12:14:00 +00:00
parent fe33ace3b2
commit 9d0d82ab6e
10 changed files with 72 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -680,7 +680,7 @@ namespace OpenSim.Region.Framework.Scenes
IUserManagement uman = RequestModuleInterface<IUserManagement>();
if (uman != null)
uman.AddUser(item.CreatorIdAsUuid, item.CreatorData);
uman.AddCreatorUser(item.CreatorIdAsUuid, item.CreatorData);
if (!Permissions.BypassPermissions())
{

10
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1330,7 +1330,7 @@ namespace OpenSim.Region.Framework.Scenes
{
tmp = SceneGridInfo.EconomyURL;
if (!string.IsNullOrEmpty(tmp))
fm.AddOpenSimExtraFeature("currency-base-uri", tmp);
fm.AddOpenSimExtraFeature("currency-base-uri", tmp);
}
}
}
@@ -3248,11 +3248,12 @@ namespace OpenSim.Region.Framework.Scenes
{
if (UserManagementModule != null)
{
string first = aCircuit.firstname, last = aCircuit.lastname;
string first = aCircuit.firstname;
string last = aCircuit.lastname;
if (sp != null && sp.PresenceType == PresenceType.Npc)
{
UserManagementModule.AddUser(aCircuit.AgentID, first, last, true);
UserManagementModule.AddNPCUser(aCircuit.AgentID, first, last);
}
else
{
@@ -4263,8 +4264,6 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
// Let the SP know how we got here. This has a lot of interesting
// uses down the line.
sp.TeleportFlags = (TPFlags)teleportFlags;
if (sp.IsChildAgent)
@@ -4294,7 +4293,6 @@ namespace OpenSim.Region.Framework.Scenes
CapsModule.ActivateCaps(acd.circuitcode);
}
return true;
}