diff options
author | Justin Clark-Casey (justincc) | 2010-07-01 22:52:31 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-01 22:52:31 +0100 |
commit | 53ddcf6d25b5ff85847f3762b15f22d1dd2f49a5 (patch) | |
tree | a79ba95917c012a46aecb62a7efc14e32064262a /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | handle ObjectMediaNavigateMessage (diff) | |
download | opensim-SC_OLD-53ddcf6d25b5ff85847f3762b15f22d1dd2f49a5.zip opensim-SC_OLD-53ddcf6d25b5ff85847f3762b15f22d1dd2f49a5.tar.gz opensim-SC_OLD-53ddcf6d25b5ff85847f3762b15f22d1dd2f49a5.tar.bz2 opensim-SC_OLD-53ddcf6d25b5ff85847f3762b15f22d1dd2f49a5.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 '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f83c4cf..1e5133b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -317,6 +317,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
317 | protected Vector3 m_lastAcceleration; | 317 | protected Vector3 m_lastAcceleration; |
318 | protected Vector3 m_lastAngularVelocity; | 318 | protected Vector3 m_lastAngularVelocity; |
319 | protected int m_lastTerseSent; | 319 | protected int m_lastTerseSent; |
320 | |||
321 | /// <summary> | ||
322 | /// Stores media texture data | ||
323 | /// </summary> | ||
324 | protected string m_mediaUrl; | ||
320 | 325 | ||
321 | // TODO: Those have to be changed into persistent properties at some later point, | 326 | // TODO: Those have to be changed into persistent properties at some later point, |
322 | // or sit-camera on vehicles will break on sim-crossing. | 327 | // or sit-camera on vehicles will break on sim-crossing. |
@@ -962,6 +967,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
962 | TriggerScriptChangedEvent(Changed.SCALE); | 967 | TriggerScriptChangedEvent(Changed.SCALE); |
963 | } | 968 | } |
964 | } | 969 | } |
970 | |||
965 | public byte UpdateFlag | 971 | public byte UpdateFlag |
966 | { | 972 | { |
967 | get { return m_updateFlag; } | 973 | get { return m_updateFlag; } |
@@ -971,7 +977,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
971 | /// <summary> | 977 | /// <summary> |
972 | /// Used for media on a prim | 978 | /// Used for media on a prim |
973 | /// </summary> | 979 | /// </summary> |
974 | public string MediaUrl { get; set; } | 980 | public string MediaUrl |
981 | { | ||
982 | get | ||
983 | { | ||
984 | return m_mediaUrl; | ||
985 | } | ||
986 | |||
987 | set | ||
988 | { | ||
989 | m_mediaUrl = value; | ||
990 | |||
991 | if (ParentGroup != null) | ||
992 | ParentGroup.HasGroupChanged = true; | ||
993 | } | ||
994 | } | ||
975 | 995 | ||
976 | [XmlIgnore] | 996 | [XmlIgnore] |
977 | public bool CreateSelected | 997 | public bool CreateSelected |