aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-01 22:52:31 +0100
committerJustin Clark-Casey (justincc)2010-07-26 23:34:19 +0100
commit9682e0c73310dae496912d7b8bc54add0fd0c3e7 (patch)
tree1491ee1b1cd4bc278b64753fde46acfd93f5cb02 /OpenSim/Region/Framework/Scenes
parenthandle ObjectMediaNavigateMessage (diff)
downloadopensim-SC_OLD-9682e0c73310dae496912d7b8bc54add0fd0c3e7.zip
opensim-SC_OLD-9682e0c73310dae496912d7b8bc54add0fd0c3e7.tar.gz
opensim-SC_OLD-9682e0c73310dae496912d7b8bc54add0fd0c3e7.tar.bz2
opensim-SC_OLD-9682e0c73310dae496912d7b8bc54add0fd0c3e7.tar.xz
Implement media texture persistence over server restarts for sqlite
This is currently persisting media as an OSDArray serialized to LLSD XML.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs22
1 files changed, 21 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c25c973..a8c20dd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -320,6 +320,11 @@ namespace OpenSim.Region.Framework.Scenes
320 protected Vector3 m_lastAcceleration; 320 protected Vector3 m_lastAcceleration;
321 protected Vector3 m_lastAngularVelocity; 321 protected Vector3 m_lastAngularVelocity;
322 protected int m_lastTerseSent; 322 protected int m_lastTerseSent;
323
324 /// <summary>
325 /// Stores media texture data
326 /// </summary>
327 protected string m_mediaUrl;
323 328
324 // TODO: Those have to be changed into persistent properties at some later point, 329 // TODO: Those have to be changed into persistent properties at some later point,
325 // or sit-camera on vehicles will break on sim-crossing. 330 // or sit-camera on vehicles will break on sim-crossing.
@@ -965,6 +970,7 @@ namespace OpenSim.Region.Framework.Scenes
965 TriggerScriptChangedEvent(Changed.SCALE); 970 TriggerScriptChangedEvent(Changed.SCALE);
966 } 971 }
967 } 972 }
973
968 public byte UpdateFlag 974 public byte UpdateFlag
969 { 975 {
970 get { return m_updateFlag; } 976 get { return m_updateFlag; }
@@ -974,7 +980,21 @@ namespace OpenSim.Region.Framework.Scenes
974 /// <summary> 980 /// <summary>
975 /// Used for media on a prim 981 /// Used for media on a prim
976 /// </summary> 982 /// </summary>
977 public string MediaUrl { get; set; } 983 public string MediaUrl
984 {
985 get
986 {
987 return m_mediaUrl;
988 }
989
990 set
991 {
992 m_mediaUrl = value;
993
994 if (ParentGroup != null)
995 ParentGroup.HasGroupChanged = true;
996 }
997 }
978 998
979 [XmlIgnore] 999 [XmlIgnore]
980 public bool CreateSelected 1000 public bool CreateSelected