diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 27cf204..cfc7e7e 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -322,6 +322,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
322 | 322 | ||
323 | if (asset != null) | 323 | if (asset != null) |
324 | { | 324 | { |
325 | // Replace an HG ID with the simple asset ID so that we can persist textures for foreign HG avatars | ||
326 | asset.ID = asset.FullID.ToString(); | ||
327 | |||
325 | asset.Temporary = false; | 328 | asset.Temporary = false; |
326 | asset.Local = false; | 329 | asset.Local = false; |
327 | m_scene.AssetService.Store(asset); | 330 | m_scene.AssetService.Store(asset); |