aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-14 23:48:24 +0100
committerJustin Clark-Casey (justincc)2010-07-14 23:48:24 +0100
commitaec3b330119a6c4e799939329bd0748ce1a265be (patch)
tree0a88fe693706435ff71ca82a8f961aa43ce51e31
parentfix previous media interact serverside checking. perform very basic serversi... (diff)
downloadopensim-SC_OLD-aec3b330119a6c4e799939329bd0748ce1a265be.zip
opensim-SC_OLD-aec3b330119a6c4e799939329bd0748ce1a265be.tar.gz
opensim-SC_OLD-aec3b330119a6c4e799939329bd0748ce1a265be.tar.bz2
opensim-SC_OLD-aec3b330119a6c4e799939329bd0748ce1a265be.tar.xz
fix bug where prim persistence would fail if media had never been set
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs15
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 51f4cef..7acbd22 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1919,14 +1919,17 @@ namespace OpenSim.Data.SQLite
1919 row["Texture"] = s.TextureEntry; 1919 row["Texture"] = s.TextureEntry;
1920 row["ExtraParams"] = s.ExtraParams; 1920 row["ExtraParams"] = s.ExtraParams;
1921 1921
1922 OSDArray meArray = new OSDArray(); 1922 if (null != s.Media)
1923 foreach (MediaEntry me in s.Media)
1924 { 1923 {
1925 OSD osd = (null == me ? new OSD() : me.GetOSD()); 1924 OSDArray meArray = new OSDArray();
1926 meArray.Add(osd); 1925 foreach (MediaEntry me in s.Media)
1926 {
1927 OSD osd = (null == me ? new OSD() : me.GetOSD());
1928 meArray.Add(osd);
1929 }
1930
1931 row["Media"] = OSDParser.SerializeLLSDXmlString(meArray);
1927 } 1932 }
1928
1929 row["Media"] = OSDParser.SerializeLLSDXmlString(meArray);
1930 } 1933 }
1931 1934
1932 /// <summary> 1935 /// <summary>