diff options
| author | Melanie Thielker | 2017-02-01 16:31:01 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-02-01 16:31:01 +0000 |
| commit | a5151bb337cfee14dff6045d7f8e293201ae94ac (patch) | |
| tree | f301338415da7160e48efcb4dc6cd1efc7faecaf /OpenSim/Region/CoreModules/Avatar | |
| parent | Secure sim stats with an (optional) password. (diff) | |
| download | opensim-SC_OLD-a5151bb337cfee14dff6045d7f8e293201ae94ac.zip opensim-SC_OLD-a5151bb337cfee14dff6045d7f8e293201ae94ac.tar.gz opensim-SC_OLD-a5151bb337cfee14dff6045d7f8e293201ae94ac.tar.bz2 opensim-SC_OLD-a5151bb337cfee14dff6045d7f8e293201ae94ac.tar.xz | |
Refactor asset handling as per Ubit's suggestion
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -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 3e47782..535d946 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -299,8 +299,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 299 | if (bakedTextureFace == null) | 299 | if (bakedTextureFace == null) |
| 300 | continue; | 300 | continue; |
| 301 | 301 | ||
| 302 | bool negative; | 302 | AssetBase asset; |
| 303 | AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString(), out negative); | 303 | cache.Get(bakedTextureFace.TextureID.ToString(), out asset); |
| 304 | 304 | ||
| 305 | if (asset != null && asset.Local) | 305 | if (asset != null && asset.Local) |
| 306 | { | 306 | { |