diff options
| author | Melanie | 2013-08-07 23:29:42 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-07 23:29:42 +0100 |
| commit | 005c69511dac490a8353233423a3152abf5580dd (patch) | |
| tree | abae7717af4af3ed7844f3747ab28398fdad9cdf /OpenSim/Region/CoreModules/Agent | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff) | |
| download | opensim-SC-005c69511dac490a8353233423a3152abf5580dd.zip opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.gz opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.bz2 opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 3764685..d9b0eff 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
| @@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
| 166 | 166 | ||
| 167 | // Do Decode! | 167 | // Do Decode! |
| 168 | if (decode) | 168 | if (decode) |
| 169 | Decode(assetID, j2kData); | 169 | Util.FireAndForget(delegate { Decode(assetID, j2kData); }); |
| 170 | } | 170 | } |
| 171 | } | 171 | } |
| 172 | 172 | ||