diff options
author | Melanie | 2013-01-06 10:52:22 +0000 |
---|---|---|
committer | Melanie | 2013-01-06 10:52:22 +0000 |
commit | 083ac92b344262ae72516ba05cc93cdcd2f2a454 (patch) | |
tree | 1992de8e08171aac3e811fb1d43abc6ad8b894af /OpenSim/Framework/AvatarAppearance.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | bug fix, cleanup... (diff) | |
download | opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.zip opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.gz opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.bz2 opensim-SC-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 2183fb6..4df4fb6 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -66,7 +66,7 @@ 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 | 69 | protected WearableCacheItem[] cacheitems; | |
70 | public virtual int Serial | 70 | public virtual int Serial |
71 | { | 71 | { |
72 | get { return m_serial; } | 72 | get { return m_serial; } |
@@ -115,6 +115,12 @@ namespace OpenSim.Framework | |||
115 | get { return m_avatarHeight; } | 115 | get { return m_avatarHeight; } |
116 | set { m_avatarHeight = value; } | 116 | set { m_avatarHeight = value; } |
117 | } | 117 | } |
118 | |||
119 | public virtual WearableCacheItem[] WearableCacheItems | ||
120 | { | ||
121 | get { return cacheitems; } | ||
122 | set { cacheitems = value; } | ||
123 | } | ||
118 | 124 | ||
119 | public AvatarAppearance() | 125 | public AvatarAppearance() |
120 | { | 126 | { |