From d1a879927ccc97e90f19d916a6a0e579dd7b4a56 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Jul 2010 21:43:36 +0100
Subject: fix issue with GetMediaEntry if the face requested wasn't set to a
 media texture

---
 OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 93a1ae8..43953a7 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -112,7 +112,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             else
             {            
                 // TODO: Really need a proper copy constructor down in libopenmetaverse
-                return MediaEntry.FromOSD(media[face].GetOSD());                        
+                MediaEntry me = media[face];                
+                return (null == me ? null : MediaEntry.FromOSD(me.GetOSD()));                        
             }
         }
         
-- 
cgit v1.1