aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2014-11-10 19:49:58 +0100
committerMelanie Thielker2014-11-10 19:49:58 +0100
commit64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83 (patch)
tree378293301b9e187fc8821537e09d51e89a05e9d6 /OpenSim/Framework
parentRemove JustinCCs UDP patch - it is harmful to Avination's grid management (diff)
downloadopensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.zip
opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.tar.gz
opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.tar.bz2
opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.tar.xz
Second part of invisible base avatar option
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs28
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 3874c47..257997e 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -72,6 +72,7 @@ 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;
75 76
76 public virtual int Serial 77 public virtual int Serial
77 { 78 {
@@ -134,8 +135,30 @@ namespace OpenSim.Framework
134 set { m_cacheItemsDirty = value; } 135 set { m_cacheItemsDirty = value; }
135 } 136 }
136 137
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
137 public AvatarAppearance() 158 public AvatarAppearance()
138 { 159 {
160 CreateInvisibleTextureEntry();
161
139// m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance"); 162// m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance");
140 163
141 m_serial = 0; 164 m_serial = 0;
@@ -149,6 +172,9 @@ namespace OpenSim.Framework
149 172
150 public AvatarAppearance(OSDMap map) 173 public AvatarAppearance(OSDMap map)
151 { 174 {
175 CreateInvisibleTextureEntry();
176
177 Invisible = new Primitive.TextureEntry(new UUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"));
152// m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap"); 178// m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap");
153 179
154 Unpack(map); 180 Unpack(map);
@@ -157,6 +183,7 @@ namespace OpenSim.Framework
157 183
158 public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) 184 public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
159 { 185 {
186 CreateInvisibleTextureEntry();
160// m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance"); 187// m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance");
161 188
162 m_serial = 0; 189 m_serial = 0;
@@ -194,6 +221,7 @@ namespace OpenSim.Framework
194 221
195 public AvatarAppearance(AvatarAppearance appearance, bool copyWearables, bool copyBaked) 222 public AvatarAppearance(AvatarAppearance appearance, bool copyWearables, bool copyBaked)
196 { 223 {
224 CreateInvisibleTextureEntry();
197// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); 225// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance");
198 226
199 if (appearance == null) 227 if (appearance == null)