diff options
author | Melanie Thielker | 2014-11-11 07:09:30 +0100 |
---|---|---|
committer | Melanie Thielker | 2014-11-11 07:09:30 +0100 |
commit | bec456c2a529ca0b9ca7fd59e8110e5d5b27c126 (patch) | |
tree | fdeb239af06878f6cfb39a137e61adfe04f0baa5 /OpenSim/Framework/AvatarAppearance.cs | |
parent | Merge branch 'avination-current' (diff) | |
download | opensim-SC-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.zip opensim-SC-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.gz opensim-SC-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.bz2 opensim-SC-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.xz |
Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 257997e..3874c47 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -72,7 +72,6 @@ namespace OpenSim.Framework | |||
72 | protected float m_avatarAnimOffset = 0; | 72 | protected float m_avatarAnimOffset = 0; |
73 | protected WearableCacheItem[] m_cacheitems; | 73 | protected WearableCacheItem[] m_cacheitems; |
74 | protected bool m_cacheItemsDirty = true; | 74 | protected bool m_cacheItemsDirty = true; |
75 | public static Primitive.TextureEntry Invisible = null; | ||
76 | 75 | ||
77 | public virtual int Serial | 76 | public virtual int Serial |
78 | { | 77 | { |
@@ -135,30 +134,8 @@ namespace OpenSim.Framework | |||
135 | set { m_cacheItemsDirty = value; } | 134 | set { m_cacheItemsDirty = value; } |
136 | } | 135 | } |
137 | 136 | ||
138 | private void CreateInvisibleTextureEntry() | ||
139 | { | ||
140 | if (Invisible != null) | ||
141 | return; | ||
142 | Invisible = new Primitive.TextureEntry(new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903")); | ||
143 | |||
144 | Invisible.FaceTextures[8] = new Primitive.TextureEntryFace(null); | ||
145 | Invisible.FaceTextures[8].TextureID = new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); | ||
146 | Invisible.FaceTextures[9] = new Primitive.TextureEntryFace(null); | ||
147 | Invisible.FaceTextures[9].TextureID = new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); | ||
148 | Invisible.FaceTextures[10] = new Primitive.TextureEntryFace(null); | ||
149 | Invisible.FaceTextures[10].TextureID = new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); | ||
150 | Invisible.FaceTextures[11] = new Primitive.TextureEntryFace(null); | ||
151 | Invisible.FaceTextures[11].TextureID = new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); | ||
152 | Invisible.FaceTextures[19] = new Primitive.TextureEntryFace(null); | ||
153 | Invisible.FaceTextures[19].TextureID = new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); | ||
154 | Invisible.FaceTextures[20] = new Primitive.TextureEntryFace(null); | ||
155 | Invisible.FaceTextures[20].TextureID = new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"); | ||
156 | } | ||
157 | |||
158 | public AvatarAppearance() | 137 | public AvatarAppearance() |
159 | { | 138 | { |
160 | CreateInvisibleTextureEntry(); | ||
161 | |||
162 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance"); | 139 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance"); |
163 | 140 | ||
164 | m_serial = 0; | 141 | m_serial = 0; |
@@ -172,9 +149,6 @@ namespace OpenSim.Framework | |||
172 | 149 | ||
173 | public AvatarAppearance(OSDMap map) | 150 | public AvatarAppearance(OSDMap map) |
174 | { | 151 | { |
175 | CreateInvisibleTextureEntry(); | ||
176 | |||
177 | Invisible = new Primitive.TextureEntry(new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903")); | ||
178 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap"); | 152 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap"); |
179 | 153 | ||
180 | Unpack(map); | 154 | Unpack(map); |
@@ -183,7 +157,6 @@ namespace OpenSim.Framework | |||
183 | 157 | ||
184 | public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) | 158 | public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) |
185 | { | 159 | { |
186 | CreateInvisibleTextureEntry(); | ||
187 | // m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance"); | 160 | // m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance"); |
188 | 161 | ||
189 | m_serial = 0; | 162 | m_serial = 0; |
@@ -221,7 +194,6 @@ namespace OpenSim.Framework | |||
221 | 194 | ||
222 | public AvatarAppearance(AvatarAppearance appearance, bool copyWearables, bool copyBaked) | 195 | public AvatarAppearance(AvatarAppearance appearance, bool copyWearables, bool copyBaked) |
223 | { | 196 | { |
224 | CreateInvisibleTextureEntry(); | ||
225 | // m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); | 197 | // m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); |
226 | 198 | ||
227 | if (appearance == null) | 199 | if (appearance == null) |