aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-08-14 02:36:50 +0100
committerUbitUmarov2014-08-14 02:36:50 +0100
commit395903d58fceb98d467daa49aaa277f54ea3f230 (patch)
tree1eac9212ba0fcc9b8c69b5cfb4eea443f922f119 /OpenSim/Framework/AvatarAppearance.cs
parent*DANGER* make baked textures cross and make use of it * UNTESTED * (diff)
downloadopensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.zip
opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.tar.gz
opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.tar.bz2
opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.tar.xz
*DANGER* dont send baked textures assets to Neighbours. Possible we could
send a lot less
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 25ae0ec..3874c47 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -183,11 +183,16 @@ namespace OpenSim.Framework
183 m_attachments = new Dictionary<int, List<AvatarAttachment>>(); 183 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
184 } 184 }
185 185
186 public AvatarAppearance(AvatarAppearance appearance): this(appearance, true) 186 public AvatarAppearance(AvatarAppearance appearance): this(appearance, true,true)
187 { 187 {
188 } 188 }
189 189
190 public AvatarAppearance(AvatarAppearance appearance, bool copyWearables) 190 public AvatarAppearance(AvatarAppearance appearance, bool copyWearables)
191 : this(appearance, copyWearables, true)
192 {
193 }
194
195 public AvatarAppearance(AvatarAppearance appearance, bool copyWearables, bool copyBaked)
191 { 196 {
192// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); 197// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance");
193 198
@@ -221,8 +226,10 @@ namespace OpenSim.Framework
221 { 226 {
222 byte[] tbytes = appearance.Texture.GetBytes(); 227 byte[] tbytes = appearance.Texture.GetBytes();
223 m_texture = new Primitive.TextureEntry(tbytes,0,tbytes.Length); 228 m_texture = new Primitive.TextureEntry(tbytes,0,tbytes.Length);
224 if (appearance.m_cacheitems != null) 229 if (copyBaked && appearance.m_cacheitems != null)
225 m_cacheitems = (WearableCacheItem[]) appearance.m_cacheitems.Clone(); 230 m_cacheitems = (WearableCacheItem[])appearance.m_cacheitems.Clone();
231 else
232 m_cacheitems = null;
226 } 233 }
227 234
228 m_visualparams = null; 235 m_visualparams = null;