diff options
author | Justin Clark-Casey (justincc) | 2010-07-01 02:06:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-01 02:06:51 +0100 |
commit | 214db91503148f0bad42f951965f4acfc3cdd7e1 (patch) | |
tree | 15fd986ac6ba5ea6177c159e765f1725292dd16c /OpenSim/Framework/PrimitiveBaseShape.cs | |
parent | have a stab at sending the correct number of media entries to shapes (diff) | |
download | opensim-SC-214db91503148f0bad42f951965f4acfc3cdd7e1.zip opensim-SC-214db91503148f0bad42f951965f4acfc3cdd7e1.tar.gz opensim-SC-214db91503148f0bad42f951965f4acfc3cdd7e1.tar.bz2 opensim-SC-214db91503148f0bad42f951965f4acfc3cdd7e1.tar.xz |
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 4d1de22..517dbf6 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -26,12 +26,14 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.Drawing; | 30 | using System.Drawing; |
30 | using System.Drawing.Imaging; | 31 | using System.Drawing.Imaging; |
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using System.Xml.Serialization; | 33 | using System.Xml.Serialization; |
33 | using log4net; | 34 | using log4net; |
34 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenMetaverse.StructuredData; | ||
35 | 37 | ||
36 | namespace OpenSim.Framework | 38 | namespace OpenSim.Framework |
37 | { | 39 | { |
@@ -170,6 +172,11 @@ namespace OpenSim.Framework | |||
170 | } | 172 | } |
171 | } | 173 | } |
172 | } | 174 | } |
175 | |||
176 | /// <summary> | ||
177 | /// Entries to store media textures on each face | ||
178 | /// </summary> | ||
179 | public List<MediaEntry> Media { get; set; } | ||
173 | 180 | ||
174 | public PrimitiveBaseShape() | 181 | public PrimitiveBaseShape() |
175 | { | 182 | { |