Rename UserData to UserAccount data
parent
6a6dd66129
commit
11d72f270d
|
@ -84,6 +84,8 @@ namespace OpenSim.Grid.InventoryServer
|
||||||
|
|
||||||
m_log.Info("[" + LogName + "]: Started HTTP server");
|
m_log.Info("[" + LogName + "]: Started HTTP server");
|
||||||
|
|
||||||
|
new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
|
||||||
|
|
||||||
base.StartupSpecific();
|
base.StartupSpecific();
|
||||||
|
|
||||||
m_console.Commands.AddCommand("inventoryserver", false, "add user",
|
m_console.Commands.AddCommand("inventoryserver", false, "add user",
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
<RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
|
<RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
|
||||||
<RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
|
<RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
|
||||||
<RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
|
<RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
|
||||||
|
<RegionModule id="HGAuthServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.HGAuthServiceInConnectorModule" /> \
|
||||||
|
|
||||||
</Extension>
|
</Extension>
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ using OpenMetaverse;
|
||||||
|
|
||||||
namespace OpenSim.Services.Interfaces
|
namespace OpenSim.Services.Interfaces
|
||||||
{
|
{
|
||||||
public class UserData
|
public class UserAccountData
|
||||||
{
|
{
|
||||||
public UserData()
|
public UserData()
|
||||||
{
|
{
|
||||||
|
@ -78,7 +78,7 @@ namespace OpenSim.Services.Interfaces
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public class UserDataMessage
|
public class UserAccountDataMessage
|
||||||
{
|
{
|
||||||
public UserData Data;
|
public UserData Data;
|
||||||
|
|
||||||
|
@ -93,10 +93,10 @@ namespace OpenSim.Services.Interfaces
|
||||||
public UUID SessionID;
|
public UUID SessionID;
|
||||||
};
|
};
|
||||||
|
|
||||||
public interface IUserDataService
|
public interface IUserAccountDataService
|
||||||
{
|
{
|
||||||
UserData GetUserData(UUID scopeID, UUID userID);
|
UserData GetUserAccountData(UUID scopeID, UUID userID);
|
||||||
UserData GetUserData(UUID scopeID, string FirstName, string LastName);
|
UserData GetUserAccountData(UUID scopeID, string FirstName, string LastName);
|
||||||
|
|
||||||
// This will set only the home region portion of the data!
|
// 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!
|
// 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
|
// 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
|
// Returns the list of avatars that matches both the search
|
||||||
// criterion and the scope ID passed
|
// criterion and the scope ID passed
|
||||||
|
@ -113,6 +113,6 @@ namespace OpenSim.Services.Interfaces
|
||||||
List<UserData> GetAvatarPickerData(UUID scopeID, string query);
|
List<UserData> GetAvatarPickerData(UUID scopeID, string query);
|
||||||
|
|
||||||
// Creates a user data record
|
// Creates a user data record
|
||||||
bool CreateUserData(UserData data, UUID PrincipalID, UUID SessionID);
|
bool CreateUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue