diff options
| author | Justin Clark-Casey (justincc) | 2010-07-12 21:43:36 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-12 21:43:36 +0100 |
| commit | 01ff3c9f9f7fb223e81164647391e52ec4e975d6 (patch) | |
| tree | dfa47470276eee96008bb4b427388feb1b296185 /OpenSim/Region | |
| parent | fix problem persisting when only one face had a media texture (diff) | |
| download | opensim-SC_OLD-01ff3c9f9f7fb223e81164647391e52ec4e975d6.zip opensim-SC_OLD-01ff3c9f9f7fb223e81164647391e52ec4e975d6.tar.gz opensim-SC_OLD-01ff3c9f9f7fb223e81164647391e52ec4e975d6.tar.bz2 opensim-SC_OLD-01ff3c9f9f7fb223e81164647391e52ec4e975d6.tar.xz | |
fix issue with GetMediaEntry if the face requested wasn't set to a media texture
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 112 | else | 112 | else |
| 113 | { | 113 | { |
| 114 | // TODO: Really need a proper copy constructor down in libopenmetaverse | 114 | // TODO: Really need a proper copy constructor down in libopenmetaverse |
| 115 | return MediaEntry.FromOSD(media[face].GetOSD()); | 115 | MediaEntry me = media[face]; |
| 116 | return (null == me ? null : MediaEntry.FromOSD(me.GetOSD())); | ||
| 116 | } | 117 | } |
| 117 | } | 118 | } |
| 118 | 119 | ||