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

get rid of PrimitiveBaseShape.MediaRaw staging post

Browse Source 
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-03 16:26:27 +01:00
parent ac07d853b8
commit 9d8a67fe13
5 changed files with 15 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1346,7 +1346,7 @@ namespace OpenSim.Data.SQLite
if (!(row["MediaURL"] is System.DBNull))
{
m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
//m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
prim.MediaUrl = (string)row["MediaURL"];
}
@@ -1861,7 +1861,7 @@ namespace OpenSim.Data.SQLite
s.ExtraParams = (byte[]) row["ExtraParams"];
if (!(row["Media"] is System.DBNull))
s.MediaRaw = (string)row["Media"];
s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
return s;
}
@@ -1906,7 +1906,9 @@ namespace OpenSim.Data.SQLite
row["Texture"] = s.TextureEntry;
row["ExtraParams"] = s.ExtraParams;
row["Media"] = s.MediaRaw;
if (s.Media != null)
row["Media"] = s.Media.ToXml();
}
/// <summary>