diff options
author | Justin Clark-Casey (justincc) | 2010-07-27 18:59:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-27 18:59:05 +0100 |
commit | ac542a907bb9612a0580019d645a16697fc1c3b4 (patch) | |
tree | 583f8835a7758b07ad94b25d57566bddfbd7d010 /OpenSim/Region | |
parent | Merge branch 'moap' of ssh://opensimulator.org/var/git/opensim into moap (diff) | |
download | opensim-SC-ac542a907bb9612a0580019d645a16697fc1c3b4.zip opensim-SC-ac542a907bb9612a0580019d645a16697fc1c3b4.tar.gz opensim-SC-ac542a907bb9612a0580019d645a16697fc1c3b4.tar.bz2 opensim-SC-ac542a907bb9612a0580019d645a16697fc1c3b4.tar.xz |
Make MoapModule ignore non-sl media texture data
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index 7afeeec..81e4449 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs | |||
@@ -200,8 +200,16 @@ namespace OpenSim.Region.CoreModules.Media.Moap | |||
200 | using (StringReader sr = new StringReader(part.Shape.MediaRaw)) | 200 | using (StringReader sr = new StringReader(part.Shape.MediaRaw)) |
201 | { | 201 | { |
202 | using (XmlTextReader xtr = new XmlTextReader(sr)) | 202 | using (XmlTextReader xtr = new XmlTextReader(sr)) |
203 | { | 203 | { |
204 | xtr.ReadStartElement("osmedia"); | 204 | xtr.MoveToContent(); |
205 | |||
206 | string type = xtr.GetAttribute("type"); | ||
207 | //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type); | ||
208 | |||
209 | if (type != "sl") | ||
210 | return; | ||
211 | |||
212 | xtr.ReadStartElement("osmedia"); | ||
205 | 213 | ||
206 | OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml()); | 214 | OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml()); |
207 | 215 | ||