fix issue with GetMediaEntry if the face requested wasn't set to a media texture

2010-07-12 21:43:36 +01:00 · 2010-07-12 21:43:36 +01:00 · 01ff3c9f9f
parent d4684da8bd
commit 01ff3c9f9f
1 changed files with 2 additions and 1 deletions
--- 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()));                        
            }
        }