diff options
| author | Melanie | 2011-12-14 08:57:55 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-14 08:57:55 +0000 |
| commit | 898549d13e94643afe45ce12f33351abd70d5333 (patch) | |
| tree | be293f849a7c82442435048d565622fae4d69980 /OpenSim/Region/CoreModules | |
| parent | Spin off terrain save into a new thread and make it so that it uses the old (diff) | |
| parent | Just adding a comment to SendFullUpdatToClient (diff) | |
| download | opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.zip opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.tar.gz opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.tar.bz2 opensim-SC-898549d13e94643afe45ce12f33351abd70d5333.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 2efb269..acf36df 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -150,13 +150,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 150 | changed = sp.Appearance.SetTextureEntries(textureEntry) || changed; | 150 | changed = sp.Appearance.SetTextureEntries(textureEntry) || changed; |
| 151 | 151 | ||
| 152 | m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID); | 152 | m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID); |
| 153 | Util.FireAndForget(delegate(object o) { ValidateBakedTextureCache(sp, false); }); | 153 | ValidateBakedTextureCache(sp, false); |
| 154 | 154 | ||
| 155 | // This appears to be set only in the final stage of the appearance | 155 | // This appears to be set only in the final stage of the appearance |
| 156 | // update transaction. In theory, we should be able to do an immediate | 156 | // update transaction. In theory, we should be able to do an immediate |
| 157 | // appearance send and save here. | 157 | // appearance send and save here. |
| 158 | |||
| 159 | } | 158 | } |
| 159 | |||
| 160 | // save only if there were changes, send no matter what (doesn't hurt to send twice) | 160 | // save only if there were changes, send no matter what (doesn't hurt to send twice) |
| 161 | if (changed) | 161 | if (changed) |
| 162 | QueueAppearanceSave(sp.ControllingClient.AgentId); | 162 | QueueAppearanceSave(sp.ControllingClient.AgentId); |