diff options
| author | Diva Canto | 2015-08-08 12:12:50 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-08-08 12:12:50 -0700 |
| commit | 959872315f67a1a33a2bae7330749f7dd74a4774 (patch) | |
| tree | e31f6900453e77815859767cb2331d0412ec5b57 /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
| parent | Have osAvatarName2Key check the cache first, even for foreign users (diff) | |
| download | opensim-SC_OLD-959872315f67a1a33a2bae7330749f7dd74a4774.zip opensim-SC_OLD-959872315f67a1a33a2bae7330749f7dd74a4774.tar.gz opensim-SC_OLD-959872315f67a1a33a2bae7330749f7dd74a4774.tar.bz2 opensim-SC_OLD-959872315f67a1a33a2bae7330749f7dd74a4774.tar.xz | |
WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index ea7481d..cfb082b 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -908,8 +908,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 908 | AssetType | 908 | AssetType |
| 909 | = | 909 | = |
| 910 | (int) | 910 | (int) |
| 911 | AssetType | 911 | FolderType |
| 912 | .Bodypart, | 912 | .BodyPart, |
| 913 | CreatorId | 913 | CreatorId |
| 914 | = | 914 | = |
| 915 | userID | 915 | userID |
| @@ -924,8 +924,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 924 | invService | 924 | invService |
| 925 | .GetFolderForType | 925 | .GetFolderForType |
| 926 | (userID, | 926 | (userID, |
| 927 | AssetType | 927 | FolderType |
| 928 | .Bodypart) | 928 | .BodyPart) |
| 929 | .ID, | 929 | .ID, |
| 930 | Flags = (uint) type, | 930 | Flags = (uint) type, |
| 931 | Name = Enum.GetName(typeof (WearableType), type), | 931 | Name = Enum.GetName(typeof (WearableType), type), |
| @@ -960,8 +960,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 960 | invService | 960 | invService |
| 961 | .GetFolderForType | 961 | .GetFolderForType |
| 962 | (userID, | 962 | (userID, |
| 963 | AssetType | 963 | FolderType |
| 964 | .CurrentOutfitFolder) | 964 | .CurrentOutfit) |
| 965 | .ID, | 965 | .ID, |
| 966 | Flags = (uint) type, | 966 | Flags = (uint) type, |
| 967 | Name = Enum.GetName(typeof (WearableType), type), | 967 | Name = Enum.GetName(typeof (WearableType), type), |
| @@ -978,8 +978,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 978 | { | 978 | { |
| 979 | m_scene.SendInventoryUpdate(presence.ControllingClient, | 979 | m_scene.SendInventoryUpdate(presence.ControllingClient, |
| 980 | invService.GetFolderForType(userID, | 980 | invService.GetFolderForType(userID, |
| 981 | AssetType | 981 | FolderType |
| 982 | .CurrentOutfitFolder), | 982 | .CurrentOutfit), |
| 983 | false, true); | 983 | false, true); |
| 984 | } | 984 | } |
| 985 | } | 985 | } |