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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.7.4.1
Justin Clark-Casey (justincc) 2012-03-28 01:06:18 +01:00
parent b74a89bc12 37603ca6da
commit cb41fb64be
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
View File

@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
{
return new List<InventoryFolderBase>();
return m_RemoteConnector.GetInventorySkeleton(userId);
}
public InventoryCollection GetUserInventory(UUID userID)

2
OpenSim/Services/HypergridService/HGInventoryService.cs
View File

@ -53,8 +53,6 @@ namespace OpenSim.Services.HypergridService
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
protected new IXInventoryData m_Database;
private string m_HomeURL;
private IUserAccountService m_UserAccountService;

2
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -318,7 +318,7 @@ namespace OpenSim.Services.InventoryService
if (check.Type != -1 || xFolder.type != -1)
{
if (xFolder.version > check.Version)
if (xFolder.version < check.Version)
return false;
check.Version = (ushort)xFolder.version;
xFolder = ConvertFromOpenSim(check);