Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-30 16:01:45 +01:00
14 changed files with 72 additions and 46 deletions

View File

@@ -814,7 +814,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
IBuySellModule module = s.RequestModuleInterface<IBuySellModule>();
if (module != null)
module.BuyObject(remoteClient, categoryID, localID, saleType);
module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
}
}
@@ -825,4 +825,4 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
Gift = 2,
Purchase = 3
}
}
}