OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename UserData to UserAccount data

arthursv
Melanie 2009-08-09 21:53:11 +01:00
parent 6a6dd66129
commit 11d72f270d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Grid/InventoryServer/Main.cs
View File

@ -84,6 +84,8 @@ namespace OpenSim.Grid.InventoryServer
m_log.Info("[" + LogName + "]: Started HTTP server");
new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
base.StartupSpecific();
m_console.Commands.AddCommand("inventoryserver", false, "add user",

1
OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
View File

@ -37,6 +37,7 @@
<RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
<RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
<RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
<RegionModule id="HGAuthServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.HGAuthServiceInConnectorModule" /> \
</Extension>

14
OpenSim/Services/Interfaces/IUserService.cs
View File

@ -30,7 +30,7 @@ using OpenMetaverse;
namespace OpenSim.Services.Interfaces
{
public class UserData
public class UserAccountData
{
public UserData()
{
@ -78,7 +78,7 @@ namespace OpenSim.Services.Interfaces
};
public class UserDataMessage
public class UserAccountDataMessage
{
public UserData Data;
@ -93,10 +93,10 @@ namespace OpenSim.Services.Interfaces
public UUID SessionID;
};
public interface IUserDataService
public interface IUserAccountDataService
{
UserData GetUserData(UUID scopeID, UUID userID);
UserData GetUserData(UUID scopeID, string FirstName, string LastName);
UserData GetUserAccountData(UUID scopeID, UUID userID);
UserData GetUserAccountData(UUID scopeID, string FirstName, string LastName);
// This will set only the home region portion of the data!
// Can't be used to set god level, flags, type or change the name!
@ -105,7 +105,7 @@ namespace OpenSim.Services.Interfaces
// Update all updatable fields
//
bool SetUserData(UserData data, UUID PrincipalID, UUID SessionID);
bool SetUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
// Returns the list of avatars that matches both the search
// criterion and the scope ID passed
@ -113,6 +113,6 @@ namespace OpenSim.Services.Interfaces
List<UserData> GetAvatarPickerData(UUID scopeID, string query);
// Creates a user data record
bool CreateUserData(UserData data, UUID PrincipalID, UUID SessionID);
bool CreateUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
}
}