diff options
author | Melanie | 2011-05-08 20:23:06 +0100 |
---|---|---|
committer | Melanie | 2011-05-08 20:23:06 +0100 |
commit | b451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch) | |
tree | c9fbe41be36cf791976f9e5afabd44f69b64e747 /OpenSim/Region/CoreModules/Avatar | |
parent | Enable compressed (gzip) fatpack transfers. (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2 opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 08ac624..e92f072 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
76 | } | 76 | } |
77 | 77 | ||
78 | if (m_scene == null) | 78 | if (m_scene == null) |
79 | m_scene = scene; | 79 | m_scene = scene; |
80 | } | 80 | } |
81 | 81 | ||
82 | public void PostInitialise() | 82 | public void PostInitialise() |
@@ -162,12 +162,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
162 | // one and we're done otherwise, ask for a rebake | 162 | // one and we're done otherwise, ask for a rebake |
163 | if (checkonly) return false; | 163 | if (checkonly) return false; |
164 | 164 | ||
165 | m_log.InfoFormat("[AVFACTORY] missing baked texture {0}, request rebake",face.TextureID); | 165 | m_log.InfoFormat("[AVFACTORY]: missing baked texture {0}, requesting rebake",face.TextureID); |
166 | client.SendRebakeAvatarTextures(face.TextureID); | 166 | client.SendRebakeAvatarTextures(face.TextureID); |
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | m_log.DebugFormat("[AVFACTORY]: complete texture check for {0}", client.AgentId); | 170 | m_log.DebugFormat("[AVFACTORY]: completed texture check for {0}", client.AgentId); |
171 | 171 | ||
172 | // If we only found default textures, then the appearance is not cached | 172 | // If we only found default textures, then the appearance is not cached |
173 | return (defonly ? false : true); | 173 | return (defonly ? false : true); |