diff options
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 716baab..73b068d 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -47,7 +47,6 @@ namespace OpenSim.Framework | |||
47 | public readonly static int TEXTURE_COUNT = 21; | 47 | public readonly static int TEXTURE_COUNT = 21; |
48 | public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; | 48 | public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; |
49 | 49 | ||
50 | protected UUID m_owner; | ||
51 | protected int m_serial = 0; | 50 | protected int m_serial = 0; |
52 | protected byte[] m_visualparams; | 51 | protected byte[] m_visualparams; |
53 | protected Primitive.TextureEntry m_texture; | 52 | protected Primitive.TextureEntry m_texture; |
@@ -56,12 +55,6 @@ namespace OpenSim.Framework | |||
56 | protected float m_avatarHeight = 0; | 55 | protected float m_avatarHeight = 0; |
57 | protected float m_hipOffset = 0; | 56 | protected float m_hipOffset = 0; |
58 | 57 | ||
59 | public virtual UUID Owner | ||
60 | { | ||
61 | get { return m_owner; } | ||
62 | set { m_owner = value; } | ||
63 | } | ||
64 | |||
65 | public virtual int Serial | 58 | public virtual int Serial |
66 | { | 59 | { |
67 | get { return m_serial; } | 60 | get { return m_serial; } |
@@ -77,7 +70,11 @@ namespace OpenSim.Framework | |||
77 | public virtual Primitive.TextureEntry Texture | 70 | public virtual Primitive.TextureEntry Texture |
78 | { | 71 | { |
79 | get { return m_texture; } | 72 | get { return m_texture; } |
80 | set { m_texture = value; } | 73 | set |
74 | { | ||
75 | // m_log.DebugFormat("[AVATAR APPEARANCE]: Set TextureEntry to {0}", value); | ||
76 | m_texture = value; | ||
77 | } | ||
81 | } | 78 | } |
82 | 79 | ||
83 | public virtual AvatarWearable[] Wearables | 80 | public virtual AvatarWearable[] Wearables |
@@ -97,38 +94,31 @@ namespace OpenSim.Framework | |||
97 | get { return m_hipOffset; } | 94 | get { return m_hipOffset; } |
98 | } | 95 | } |
99 | 96 | ||
100 | public AvatarAppearance() : this(UUID.Zero) {} | 97 | public AvatarAppearance() |
101 | |||
102 | public AvatarAppearance(UUID owner) | ||
103 | { | 98 | { |
104 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner); | 99 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance"); |
105 | 100 | ||
106 | m_serial = 0; | 101 | m_serial = 0; |
107 | m_owner = owner; | ||
108 | |||
109 | SetDefaultWearables(); | 102 | SetDefaultWearables(); |
110 | SetDefaultTexture(); | 103 | SetDefaultTexture(); |
111 | SetDefaultParams(); | 104 | SetDefaultParams(); |
112 | SetHeight(); | 105 | SetHeight(); |
113 | |||
114 | m_attachments = new Dictionary<int, List<AvatarAttachment>>(); | 106 | m_attachments = new Dictionary<int, List<AvatarAttachment>>(); |
115 | } | 107 | } |
116 | 108 | ||
117 | public AvatarAppearance(UUID avatarID, OSDMap map) | 109 | public AvatarAppearance(OSDMap map) |
118 | { | 110 | { |
119 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID); | 111 | // m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap"); |
120 | 112 | ||
121 | m_owner = avatarID; | ||
122 | Unpack(map); | 113 | Unpack(map); |
123 | SetHeight(); | 114 | SetHeight(); |
124 | } | 115 | } |
125 | 116 | ||
126 | public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) | 117 | public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) |
127 | { | 118 | { |
128 | // m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); | 119 | // m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance"); |
129 | 120 | ||
130 | m_serial = 0; | 121 | m_serial = 0; |
131 | m_owner = avatarID; | ||
132 | 122 | ||
133 | if (wearables != null) | 123 | if (wearables != null) |
134 | m_wearables = wearables; | 124 | m_wearables = wearables; |
@@ -161,24 +151,21 @@ namespace OpenSim.Framework | |||
161 | if (appearance == null) | 151 | if (appearance == null) |
162 | { | 152 | { |
163 | m_serial = 0; | 153 | m_serial = 0; |
164 | m_owner = UUID.Zero; | ||
165 | |||
166 | SetDefaultWearables(); | 154 | SetDefaultWearables(); |
167 | SetDefaultTexture(); | 155 | SetDefaultTexture(); |
168 | SetDefaultParams(); | 156 | SetDefaultParams(); |
169 | SetHeight(); | 157 | SetHeight(); |
170 | |||
171 | m_attachments = new Dictionary<int, List<AvatarAttachment>>(); | 158 | m_attachments = new Dictionary<int, List<AvatarAttachment>>(); |
172 | 159 | ||
173 | return; | 160 | return; |
174 | } | 161 | } |
175 | 162 | ||
176 | m_serial = appearance.Serial; | 163 | m_serial = appearance.Serial; |
177 | m_owner = appearance.Owner; | ||
178 | 164 | ||
179 | m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; | 165 | m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; |
180 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) | 166 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) |
181 | m_wearables[i] = new AvatarWearable(); | 167 | m_wearables[i] = new AvatarWearable(); |
168 | |||
182 | if (copyWearables && (appearance.Wearables != null)) | 169 | if (copyWearables && (appearance.Wearables != null)) |
183 | { | 170 | { |
184 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) | 171 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) |