diff options
author | teravus | 2012-12-29 08:53:58 -0500 |
---|---|---|
committer | teravus | 2012-12-29 08:53:58 -0500 |
commit | 6797ac14741851efa5ba60a00891e18cf7755c80 (patch) | |
tree | b2b9b4870100f12d59d3bcd257349051fdede2d4 /OpenSim/Framework/AvatarAppearance.cs | |
parent | bug fix, cleanup... (diff) | |
download | opensim-SC-6797ac14741851efa5ba60a00891e18cf7755c80.zip opensim-SC-6797ac14741851efa5ba60a00891e18cf7755c80.tar.gz opensim-SC-6797ac14741851efa5ba60a00891e18cf7755c80.tar.bz2 opensim-SC-6797ac14741851efa5ba60a00891e18cf7755c80.tar.xz |
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 4df4fb6..ffc3527 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -66,7 +66,9 @@ namespace OpenSim.Framework | |||
66 | protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f); | 66 | protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f); |
67 | protected float m_avatarFeetOffset = 0; | 67 | protected float m_avatarFeetOffset = 0; |
68 | protected float m_avatarAnimOffset = 0; | 68 | protected float m_avatarAnimOffset = 0; |
69 | protected WearableCacheItem[] cacheitems; | 69 | protected WearableCacheItem[] m_cacheitems; |
70 | protected bool m_cacheItemsDirty = true; | ||
71 | |||
70 | public virtual int Serial | 72 | public virtual int Serial |
71 | { | 73 | { |
72 | get { return m_serial; } | 74 | get { return m_serial; } |
@@ -118,8 +120,14 @@ namespace OpenSim.Framework | |||
118 | 120 | ||
119 | public virtual WearableCacheItem[] WearableCacheItems | 121 | public virtual WearableCacheItem[] WearableCacheItems |
120 | { | 122 | { |
121 | get { return cacheitems; } | 123 | get { return m_cacheitems; } |
122 | set { cacheitems = value; } | 124 | set { m_cacheitems = value; } |
125 | } | ||
126 | |||
127 | public virtual bool WearableCacheItemsDirty | ||
128 | { | ||
129 | get { return m_cacheItemsDirty; } | ||
130 | set { m_cacheItemsDirty = value; } | ||
123 | } | 131 | } |
124 | 132 | ||
125 | public AvatarAppearance() | 133 | public AvatarAppearance() |