diff options
| author | Melanie Thielker | 2016-07-04 03:35:48 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-07-04 03:35:48 +0100 |
| commit | ea8f3c83bf96453e8223d918933d5708fa49a3cc (patch) | |
| tree | 288972a5d6f112426da2b5ab109fe18ba5aedc2e /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
| parent | increase xmlrpc timeout in xmlrpcgroups, disable its cache until its entries ... (diff) | |
| download | opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.zip opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.gz opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.bz2 opensim-SC_OLD-ea8f3c83bf96453e8223d918933d5708fa49a3cc.tar.xz | |
Finally remove the requirement for an InventoryItem/FolderBase object to
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index c800383..08b276d 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -904,8 +904,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 904 | continue; | 904 | continue; |
| 905 | } | 905 | } |
| 906 | 906 | ||
| 907 | InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID); | 907 | InventoryItemBase baseItem = invService.GetItem(userID, appearance.Wearables[i][j].ItemID); |
| 908 | baseItem = invService.GetItem(baseItem); | ||
| 909 | 908 | ||
| 910 | if (baseItem != null) | 909 | if (baseItem != null) |
| 911 | { | 910 | { |