diff options
author | Melanie Thielker | 2008-11-11 02:24:33 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-11 02:24:33 +0000 |
commit | 7af1afb6df2f939b7dd6e2fc3df49eb1f7e38aa8 (patch) | |
tree | a5712e795518a3ea53df01fb1c62df964ebad0a1 | |
parent | Allow gods to terraform without limits. Respect the Allow Others To (diff) | |
download | opensim-SC-7af1afb6df2f939b7dd6e2fc3df49eb1f7e38aa8.zip opensim-SC-7af1afb6df2f939b7dd6e2fc3df49eb1f7e38aa8.tar.gz opensim-SC-7af1afb6df2f939b7dd6e2fc3df49eb1f7e38aa8.tar.bz2 opensim-SC-7af1afb6df2f939b7dd6e2fc3df49eb1f7e38aa8.tar.xz |
Fix a nullref in attachment packing
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index a4801ad..bfa9763 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -323,7 +323,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
323 | foreach (string assembly in assemblies) | 323 | foreach (string assembly in assemblies) |
324 | { | 324 | { |
325 | string fn = Path.GetFileName(assembly); | 325 | string fn = Path.GetFileName(assembly); |
326 | if (fn == String.Empty) | ||
327 | continue; | ||
328 | |||
326 | FileInfo fi = new FileInfo(assembly); | 329 | FileInfo fi = new FileInfo(assembly); |
330 | |||
331 | if (fi == null) | ||
332 | continue; | ||
333 | |||
327 | Byte[] data = new Byte[fi.Length]; | 334 | Byte[] data = new Byte[fi.Length]; |
328 | 335 | ||
329 | FileStream fs = File.Open(assembly, FileMode.Open, FileAccess.Read); | 336 | FileStream fs = File.Open(assembly, FileMode.Open, FileAccess.Read); |