Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
cb41fb64be
|
@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
|
|
||||||
public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
|
public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
|
||||||
{
|
{
|
||||||
return new List<InventoryFolderBase>();
|
return m_RemoteConnector.GetInventorySkeleton(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public InventoryCollection GetUserInventory(UUID userID)
|
public InventoryCollection GetUserInventory(UUID userID)
|
||||||
|
|
|
@ -53,8 +53,6 @@ namespace OpenSim.Services.HypergridService
|
||||||
LogManager.GetLogger(
|
LogManager.GetLogger(
|
||||||
MethodBase.GetCurrentMethod().DeclaringType);
|
MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
protected new IXInventoryData m_Database;
|
|
||||||
|
|
||||||
private string m_HomeURL;
|
private string m_HomeURL;
|
||||||
private IUserAccountService m_UserAccountService;
|
private IUserAccountService m_UserAccountService;
|
||||||
|
|
||||||
|
|
|
@ -318,7 +318,7 @@ namespace OpenSim.Services.InventoryService
|
||||||
|
|
||||||
if (check.Type != -1 || xFolder.type != -1)
|
if (check.Type != -1 || xFolder.type != -1)
|
||||||
{
|
{
|
||||||
if (xFolder.version > check.Version)
|
if (xFolder.version < check.Version)
|
||||||
return false;
|
return false;
|
||||||
check.Version = (ushort)xFolder.version;
|
check.Version = (ushort)xFolder.version;
|
||||||
xFolder = ConvertFromOpenSim(check);
|
xFolder = ConvertFromOpenSim(check);
|
||||||
|
|
Loading…
Reference in New Issue