aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorSean Dague2009-04-13 14:52:23 +0000
committerSean Dague2009-04-13 14:52:23 +0000
commitb2e5f039421ea6c9843c78ae91fa17ada29f724c (patch)
tree52d7ae843889ac9498dcc5e3bb0540251cd4e5f7 /OpenSim/Region/ClientStack
parentput J2KImage into it's own file, please no doubling up on classes in (diff)
downloadopensim-SC_OLD-b2e5f039421ea6c9843c78ae91fa17ada29f724c.zip
opensim-SC_OLD-b2e5f039421ea6c9843c78ae91fa17ada29f724c.tar.gz
opensim-SC_OLD-b2e5f039421ea6c9843c78ae91fa17ada29f724c.tar.bz2
opensim-SC_OLD-b2e5f039421ea6c9843c78ae91fa17ada29f724c.tar.xz
catch for a null asset so we don't get an exception here, though this
probably just makes the decoder break somewhere else.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index d8cf9a7..54be807 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -85,7 +85,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
85 85
86 public byte[] Data 86 public byte[] Data
87 { 87 {
88 get { return m_asset.Data; } 88 get
89 {
90 if (m_asset != null)
91 return m_asset.Data;
92 else
93 return null;
94 }
89 } 95 }
90 96
91 public ushort TexturePacketCount() 97 public ushort TexturePacketCount()