aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-27 20:15:43 +0100
committerJustin Clark-Casey (justincc)2010-07-27 20:15:43 +0100
commit30ac67fb3d10c0cdeb82bb995b579986a4fed528 (patch)
tree0bc5ba164efe0bc07b737141d61afaba01ec1657 /OpenSim
parentMake MoapModule ignore non-sl media texture data (diff)
downloadopensim-SC_OLD-30ac67fb3d10c0cdeb82bb995b579986a4fed528.zip
opensim-SC_OLD-30ac67fb3d10c0cdeb82bb995b579986a4fed528.tar.gz
opensim-SC_OLD-30ac67fb3d10c0cdeb82bb995b579986a4fed528.tar.bz2
opensim-SC_OLD-30ac67fb3d10c0cdeb82bb995b579986a4fed528.tar.xz
make MoapModule ignore possible future media texture data that it can't handle
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 81e4449..3a86167 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -60,6 +60,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap
60 public string Name { get { return "MoapModule"; } } 60 public string Name { get { return "MoapModule"; } }
61 public Type ReplaceableInterface { get { return null; } } 61 public Type ReplaceableInterface { get { return null; } }
62 62
63 public const string MEDIA_TEXTURE_TYPE = "sl";
64
63 /// <summary> 65 /// <summary>
64 /// Is this module enabled? 66 /// Is this module enabled?
65 /// </summary> 67 /// </summary>
@@ -206,7 +208,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
206 string type = xtr.GetAttribute("type"); 208 string type = xtr.GetAttribute("type");
207 //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type); 209 //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type);
208 210
209 if (type != "sl") 211 if (type != MEDIA_TEXTURE_TYPE)
210 return; 212 return;
211 213
212 xtr.ReadStartElement("osmedia"); 214 xtr.ReadStartElement("osmedia");
@@ -237,7 +239,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
237 using (XmlTextWriter xtw = new XmlTextWriter(sw)) 239 using (XmlTextWriter xtw = new XmlTextWriter(sw))
238 { 240 {
239 xtw.WriteStartElement("osmedia"); 241 xtw.WriteStartElement("osmedia");
240 xtw.WriteAttributeString("type", "sl"); 242 xtw.WriteAttributeString("type", MEDIA_TEXTURE_TYPE);
241 xtw.WriteAttributeString("major_version", "0"); 243 xtw.WriteAttributeString("major_version", "0");
242 xtw.WriteAttributeString("minor_version", "1"); 244 xtw.WriteAttributeString("minor_version", "1");
243 245