From 214db91503148f0bad42f951965f4acfc3cdd7e1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Jul 2010 02:06:51 +0100
Subject: 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
---
OpenSim/Framework/PrimitiveBaseShape.cs | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'OpenSim/Framework')
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 @@
*/
using System;
+using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Reflection;
using System.Xml.Serialization;
using log4net;
using OpenMetaverse;
+using OpenMetaverse.StructuredData;
namespace OpenSim.Framework
{
@@ -170,6 +172,11 @@ namespace OpenSim.Framework
}
}
}
+
+ ///
+ /// Entries to store media textures on each face
+ ///
+ public List Media { get; set; }
public PrimitiveBaseShape()
{
--
cgit v1.1