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

* refactor: rename UserServiceAdmin to UserAdminService

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-11-28 16:04:01 +00:00
parent 63851f1441
commit 18974b7766
10 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/OpenSim.cs
View File

@@ -800,7 +800,7 @@ namespace OpenSim
if (null == m_commsManager.UserService.GetUserProfile(firstName, lastName))
{
m_commsManager.UserServiceAdmin.AddUser(firstName, lastName, password, email, regX, regY);
m_commsManager.UserAdminService.AddUser(firstName, lastName, password, email, regX, regY);
}
else
{
@@ -830,7 +830,7 @@ namespace OpenSim
newPassword = MainConsole.Instance.PasswdPrompt("New password");
else newPassword = cmdparams[4];
m_commsManager.UserServiceAdmin.ResetUserPassword(firstName, lastName, newPassword);
m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword);
}
protected void SaveXml(string[] cmdparams)

3
OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
View File

@@ -42,7 +42,7 @@ namespace OpenSim.Region.Communications.Hypergrid
BaseHttpServer httpServer,
AssetCache assetCache,
IUserService userService,
IUserServiceAdmin userServiceAdmin,
IUserAdminService userServiceAdmin,
LocalInventoryService inventoryService,
IInterRegionCommunications interRegionService,
HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
@@ -54,6 +54,5 @@ namespace OpenSim.Region.Communications.Hypergrid
AddSecureInventoryService((ISecureInventoryService)inventoryService);
m_inventoryServices = null;
}
}
}

4
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@@ -39,7 +39,7 @@ namespace OpenSim.Region.Communications.Local
BaseHttpServer httpServer,
AssetCache assetCache,
IUserService userService,
IUserServiceAdmin userServiceAdmin,
IUserAdminService userServiceAdmin,
LocalInventoryService inventoryService,
IInterRegionCommunications interRegionService,
IGridServices gridService, IMessagingService messageService,
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.Local
m_defaultInventoryHost = inventoryService.Host;
m_interServiceInventoryService = inventoryService;
m_userService = userService;
m_userServiceAdmin = userServiceAdmin;
m_userAdminService = userServiceAdmin;
m_avatarService = (IAvatarService)userService;
m_gridService = gridService;
m_interRegion = interRegionService;

2
OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
View File

@@ -530,7 +530,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
// get seed capagentData.firstname = FirstName;agentData.lastname = LastName;
if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode)
{
homeScene.CommsManager.UserServiceAdmin.AddUser(
homeScene.CommsManager.UserAdminService.AddUser(
agentData.firstname, agentData.lastname, CreateRandomStr(7), "",
homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID);

2
OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
View File

@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
Assert.That(
scene.CommsManager.UserServiceAdmin.AddUser(
scene.CommsManager.UserAdminService.AddUser(
"Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
Is.EqualTo(agentId));

2
OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
View File

@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
LocalUserServices lus = new LocalUserServices(991, 992, lis);
m_userService = lus;
m_userServiceAdmin = lus;
m_userAdminService = lus;
}
}
}