aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-01 02:06:51 +0100
committerJustin Clark-Casey (justincc)2010-07-26 23:34:18 +0100
commitacac47830e3d7d9103c30729ad0cff50b0e8fcdc (patch)
treeba85833ac3ce4ed85ab628cb0cc4fd0508092882 /OpenSim/Framework
parenthave a stab at sending the correct number of media entries to shapes (diff)
downloadopensim-SC_OLD-acac47830e3d7d9103c30729ad0cff50b0e8fcdc.zip
opensim-SC_OLD-acac47830e3d7d9103c30729ad0cff50b0e8fcdc.tar.gz
opensim-SC_OLD-acac47830e3d7d9103c30729ad0cff50b0e8fcdc.tar.bz2
opensim-SC_OLD-acac47830e3d7d9103c30729ad0cff50b0e8fcdc.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 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs7
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
28using System; 28using System;
29using System.Collections.Generic;
29using System.Drawing; 30using System.Drawing;
30using System.Drawing.Imaging; 31using System.Drawing.Imaging;
31using System.Reflection; 32using System.Reflection;
32using System.Xml.Serialization; 33using System.Xml.Serialization;
33using log4net; 34using log4net;
34using OpenMetaverse; 35using OpenMetaverse;
36using OpenMetaverse.StructuredData;
35 37
36namespace OpenSim.Framework 38namespace 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 {