diff options
author | Melanie | 2012-05-14 23:32:49 +0100 |
---|---|---|
committer | Melanie | 2012-05-14 23:32:49 +0100 |
commit | 6126b6da72bc0d3265df1ec45901f10737173d9a (patch) | |
tree | 2e645853cccef8591738a59a8b76bb14a0d2fb0b /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Save the Telehub and its Spawn Points in the OAR (diff) | |
download | opensim-SC_OLD-6126b6da72bc0d3265df1ec45901f10737173d9a.zip opensim-SC_OLD-6126b6da72bc0d3265df1ec45901f10737173d9a.tar.gz opensim-SC_OLD-6126b6da72bc0d3265df1ec45901f10737173d9a.tar.bz2 opensim-SC_OLD-6126b6da72bc0d3265df1ec45901f10737173d9a.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index d98ea39..875c073 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -371,11 +371,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
371 | if (missingTexturesOnly) | 371 | if (missingTexturesOnly) |
372 | { | 372 | { |
373 | if (m_scene.AssetService.Get(face.TextureID.ToString()) != null) | 373 | if (m_scene.AssetService.Get(face.TextureID.ToString()) != null) |
374 | { | ||
374 | continue; | 375 | continue; |
376 | } | ||
375 | else | 377 | else |
378 | { | ||
379 | // On inter-simulator teleports, this occurs if baked textures are not being stored by the | ||
380 | // grid asset service (which means that they are not available to the new region and so have | ||
381 | // to be re-requested from the client). | ||
382 | // | ||
383 | // The only available core OpenSimulator behaviour right now | ||
384 | // is not to store these textures, temporarily or otherwise. | ||
376 | m_log.DebugFormat( | 385 | m_log.DebugFormat( |
377 | "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.", | 386 | "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.", |
378 | face.TextureID, idx, sp.Name); | 387 | face.TextureID, idx, sp.Name); |
388 | } | ||
379 | } | 389 | } |
380 | else | 390 | else |
381 | { | 391 | { |