ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix problem persisting when only one face had a media texture

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-07-12 21:33:27 +01:00
parent c76e2ce250
commit 43f480864b
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@@ -1867,7 +1867,10 @@ namespace OpenSim.Data.SQLite
List<MediaEntry> mediaEntries = new List<MediaEntry>();
foreach (OSD osdMe in osdMeArray)
mediaEntries.Add(MediaEntry.FromOSD(osdMe));
{
MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
mediaEntries.Add(me);
}
s.Media = mediaEntries;
}
@@ -1918,7 +1921,10 @@ namespace OpenSim.Data.SQLite
OSDArray meArray = new OSDArray();
foreach (MediaEntry me in s.Media)
meArray.Add(me.GetOSD());
{
OSD osd = (null == me ? new OSD() : me.GetOSD());
meArray.Add(osd);
}
row["Media"] = OSDParser.SerializeLLSDXmlString(meArray);
}