diff options
| author | Dr Scofield | 2009-05-19 18:34:04 +0000 |
|---|---|---|
| committer | Dr Scofield | 2009-05-19 18:34:04 +0000 |
| commit | 8559f9bbbacf417e7375e47e8267e7e11ea0cc8d (patch) | |
| tree | 920912570c6e248b0eefeab87a2c475d42a939c4 /OpenSim/Region | |
| parent | Add initializing m_scene if it's not null. Marking MyScene as [Obsolete] (diff) | |
| download | opensim-SC-8559f9bbbacf417e7375e47e8267e7e11ea0cc8d.zip opensim-SC-8559f9bbbacf417e7375e47e8267e7e11ea0cc8d.tar.gz opensim-SC-8559f9bbbacf417e7375e47e8267e7e11ea0cc8d.tar.bz2 opensim-SC-8559f9bbbacf417e7375e47e8267e7e11ea0cc8d.tar.xz | |
From: Alan Webb <alan_webb@us.ibm.com>
The image render module is returning everything twice. Once with
data, once with null. This change adds a return to stop this
behavior. This was not apparent until I added a message to the
catching routine which issued a warning message when no data was
returned.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index 4abc55d..864d6ac 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
| @@ -211,6 +211,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | m_textureManager.ReturnData(state.RequestID, imageJ2000); | 213 | m_textureManager.ReturnData(state.RequestID, imageJ2000); |
| 214 | return; | ||
| 214 | } | 215 | } |
| 215 | } | 216 | } |
| 216 | catch (WebException) | 217 | catch (WebException) |