diff options
author | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-30 14:10:13 -0400 |
commit | e371d3208cdda87f8ea86adb591ed6225f0aa442 (patch) | |
tree | f481acfbafcb7134c00ff519c0c12b41e7815d02 /OpenSim/Services/Interfaces | |
parent | Merge branch 'master' into mantis5110 (diff) | |
parent | Logins work now, but avatars are green ugly gnomes. (diff) | |
download | opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.zip opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.gz opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.bz2 opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.xz |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Interfaces/IAvatarService.cs | 149 |
1 files changed, 94 insertions, 55 deletions
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index eaa6534..186871a 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
@@ -149,33 +149,33 @@ namespace OpenSim.Services.Interfaces | |||
149 | Data["Serial"] = appearance.Serial.ToString(); | 149 | Data["Serial"] = appearance.Serial.ToString(); |
150 | // Wearables | 150 | // Wearables |
151 | Data["AvatarHeight"] = appearance.AvatarHeight.ToString(); | 151 | Data["AvatarHeight"] = appearance.AvatarHeight.ToString(); |
152 | Data["BodyItem"] = appearance.BodyItem.ToString(); | 152 | Data["BodyItem"] = appearance.Wearables[AvatarWearable.BODY][0].ItemID.ToString(); |
153 | Data["EyesItem"] = appearance.EyesItem.ToString(); | 153 | Data["EyesItem"] = appearance.Wearables[AvatarWearable.EYES][0].ItemID.ToString(); |
154 | Data["GlovesItem"] = appearance.GlovesItem.ToString(); | 154 | Data["GlovesItem"] = appearance.Wearables[AvatarWearable.GLOVES][0].ItemID.ToString(); |
155 | Data["HairItem"] = appearance.HairItem.ToString(); | 155 | Data["HairItem"] = appearance.Wearables[AvatarWearable.HAIR][0].ItemID.ToString(); |
156 | Data["JacketItem"] = appearance.JacketItem.ToString(); | 156 | Data["JacketItem"] = appearance.Wearables[AvatarWearable.JACKET][0].ItemID.ToString(); |
157 | Data["PantsItem"] = appearance.PantsItem.ToString(); | 157 | Data["PantsItem"] = appearance.Wearables[AvatarWearable.PANTS][0].ItemID.ToString(); |
158 | Data["ShirtItem"] = appearance.ShirtItem.ToString(); | 158 | Data["ShirtItem"] = appearance.Wearables[AvatarWearable.SHIRT][0].ItemID.ToString(); |
159 | Data["ShoesItem"] = appearance.ShoesItem.ToString(); | 159 | Data["ShoesItem"] = appearance.Wearables[AvatarWearable.SHOES][0].ItemID.ToString(); |
160 | Data["SkinItem"] = appearance.SkinItem.ToString(); | 160 | Data["SkinItem"] = appearance.Wearables[AvatarWearable.SKIN][0].ItemID.ToString(); |
161 | Data["SkirtItem"] = appearance.SkirtItem.ToString(); | 161 | Data["SkirtItem"] = appearance.Wearables[AvatarWearable.SKIRT][0].ItemID.ToString(); |
162 | Data["SocksItem"] = appearance.SocksItem.ToString(); | 162 | Data["SocksItem"] = appearance.Wearables[AvatarWearable.SOCKS][0].ItemID.ToString(); |
163 | Data["UnderPantsItem"] = appearance.UnderPantsItem.ToString(); | 163 | Data["UnderPantsItem"] = appearance.Wearables[AvatarWearable.UNDERPANTS][0].ItemID.ToString(); |
164 | Data["UnderShirtItem"] = appearance.UnderShirtItem.ToString(); | 164 | Data["UnderShirtItem"] = appearance.Wearables[AvatarWearable.UNDERSHIRT][0].ItemID.ToString(); |
165 | 165 | ||
166 | Data["BodyAsset"] = appearance.BodyAsset.ToString(); | 166 | Data["BodyAsset"] = appearance.Wearables[AvatarWearable.BODY][0].AssetID.ToString(); |
167 | Data["EyesAsset"] = appearance.EyesAsset.ToString(); | 167 | Data["EyesAsset"] = appearance.Wearables[AvatarWearable.EYES][0].AssetID.ToString(); |
168 | Data["GlovesAsset"] = appearance.GlovesAsset.ToString(); | 168 | Data["GlovesAsset"] = appearance.Wearables[AvatarWearable.GLOVES][0].AssetID.ToString(); |
169 | Data["HairAsset"] = appearance.HairAsset.ToString(); | 169 | Data["HairAsset"] = appearance.Wearables[AvatarWearable.HAIR][0].AssetID.ToString(); |
170 | Data["JacketAsset"] = appearance.JacketAsset.ToString(); | 170 | Data["JacketAsset"] = appearance.Wearables[AvatarWearable.JACKET][0].AssetID.ToString(); |
171 | Data["PantsAsset"] = appearance.PantsAsset.ToString(); | 171 | Data["PantsAsset"] = appearance.Wearables[AvatarWearable.PANTS][0].AssetID.ToString(); |
172 | Data["ShirtAsset"] = appearance.ShirtAsset.ToString(); | 172 | Data["ShirtAsset"] = appearance.Wearables[AvatarWearable.SHIRT][0].AssetID.ToString(); |
173 | Data["ShoesAsset"] = appearance.ShoesAsset.ToString(); | 173 | Data["ShoesAsset"] = appearance.Wearables[AvatarWearable.SHOES][0].AssetID.ToString(); |
174 | Data["SkinAsset"] = appearance.SkinAsset.ToString(); | 174 | Data["SkinAsset"] = appearance.Wearables[AvatarWearable.SKIN][0].AssetID.ToString(); |
175 | Data["SkirtAsset"] = appearance.SkirtAsset.ToString(); | 175 | Data["SkirtAsset"] = appearance.Wearables[AvatarWearable.SKIRT][0].AssetID.ToString(); |
176 | Data["SocksAsset"] = appearance.SocksAsset.ToString(); | 176 | Data["SocksAsset"] = appearance.Wearables[AvatarWearable.SOCKS][0].AssetID.ToString(); |
177 | Data["UnderPantsAsset"] = appearance.UnderPantsAsset.ToString(); | 177 | Data["UnderPantsAsset"] = appearance.Wearables[AvatarWearable.UNDERPANTS][0].AssetID.ToString(); |
178 | Data["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString(); | 178 | Data["UnderShirtAsset"] = appearance.Wearables[AvatarWearable.UNDERSHIRT][0].AssetID.ToString(); |
179 | 179 | ||
180 | // Attachments | 180 | // Attachments |
181 | List<AvatarAttachment> attachments = appearance.GetAttachments(); | 181 | List<AvatarAttachment> attachments = appearance.GetAttachments(); |
@@ -190,36 +190,75 @@ namespace OpenSim.Services.Interfaces | |||
190 | AvatarAppearance appearance = new AvatarAppearance(owner); | 190 | AvatarAppearance appearance = new AvatarAppearance(owner); |
191 | try | 191 | try |
192 | { | 192 | { |
193 | appearance.Serial = Int32.Parse(Data["Serial"]); | 193 | if (Data.ContainsKey("Serial")) |
194 | appearance.Serial = Int32.Parse(Data["Serial"]); | ||
194 | 195 | ||
195 | // Wearables | 196 | // Wearables |
196 | appearance.BodyItem = UUID.Parse(Data["BodyItem"]); | 197 | if (Data.ContainsKey("BodyItem")) |
197 | appearance.EyesItem = UUID.Parse(Data["EyesItem"]); | 198 | appearance.Wearables[AvatarWearable.BODY].Wear( |
198 | appearance.GlovesItem = UUID.Parse(Data["GlovesItem"]); | 199 | UUID.Parse(Data["BodyItem"]), |
199 | appearance.HairItem = UUID.Parse(Data["HairItem"]); | 200 | UUID.Parse(Data["BodyAsset"])); |
200 | appearance.JacketItem = UUID.Parse(Data["JacketItem"]); | 201 | |
201 | appearance.PantsItem = UUID.Parse(Data["PantsItem"]); | 202 | if (Data.ContainsKey("SkinItem")) |
202 | appearance.ShirtItem = UUID.Parse(Data["ShirtItem"]); | 203 | appearance.Wearables[AvatarWearable.SKIN].Wear( |
203 | appearance.ShoesItem = UUID.Parse(Data["ShoesItem"]); | 204 | UUID.Parse(Data["SkinItem"]), |
204 | appearance.SkinItem = UUID.Parse(Data["SkinItem"]); | 205 | UUID.Parse(Data["SkinAsset"])); |
205 | appearance.SkirtItem = UUID.Parse(Data["SkirtItem"]); | 206 | |
206 | appearance.SocksItem = UUID.Parse(Data["SocksItem"]); | 207 | if (Data.ContainsKey("HairItem")) |
207 | appearance.UnderPantsItem = UUID.Parse(Data["UnderPantsItem"]); | 208 | appearance.Wearables[AvatarWearable.HAIR].Wear( |
208 | appearance.UnderShirtItem = UUID.Parse(Data["UnderShirtItem"]); | 209 | UUID.Parse(Data["HairItem"]), |
209 | 210 | UUID.Parse(Data["HairAsset"])); | |
210 | appearance.BodyAsset = UUID.Parse(Data["BodyAsset"]); | 211 | |
211 | appearance.EyesAsset = UUID.Parse(Data["EyesAsset"]); | 212 | if (Data.ContainsKey("EyesItem")) |
212 | appearance.GlovesAsset = UUID.Parse(Data["GlovesAsset"]); | 213 | appearance.Wearables[AvatarWearable.EYES].Wear( |
213 | appearance.HairAsset = UUID.Parse(Data["HairAsset"]); | 214 | UUID.Parse(Data["EyesItem"]), |
214 | appearance.JacketAsset = UUID.Parse(Data["JacketAsset"]); | 215 | UUID.Parse(Data["EyesAsset"])); |
215 | appearance.PantsAsset = UUID.Parse(Data["PantsAsset"]); | 216 | |
216 | appearance.ShirtAsset = UUID.Parse(Data["ShirtAsset"]); | 217 | if (Data.ContainsKey("ShirtItem")) |
217 | appearance.ShoesAsset = UUID.Parse(Data["ShoesAsset"]); | 218 | appearance.Wearables[AvatarWearable.SHIRT].Wear( |
218 | appearance.SkinAsset = UUID.Parse(Data["SkinAsset"]); | 219 | UUID.Parse(Data["ShirtItem"]), |
219 | appearance.SkirtAsset = UUID.Parse(Data["SkirtAsset"]); | 220 | UUID.Parse(Data["ShirtAsset"])); |
220 | appearance.SocksAsset = UUID.Parse(Data["SocksAsset"]); | 221 | |
221 | appearance.UnderPantsAsset = UUID.Parse(Data["UnderPantsAsset"]); | 222 | if (Data.ContainsKey("PantsItem")) |
222 | appearance.UnderShirtAsset = UUID.Parse(Data["UnderShirtAsset"]); | 223 | appearance.Wearables[AvatarWearable.PANTS].Wear( |
224 | UUID.Parse(Data["PantsItem"]), | ||
225 | UUID.Parse(Data["PantsAsset"])); | ||
226 | |||
227 | if (Data.ContainsKey("ShoesItem")) | ||
228 | appearance.Wearables[AvatarWearable.SHOES].Wear( | ||
229 | UUID.Parse(Data["ShoesItem"]), | ||
230 | UUID.Parse(Data["ShoesAsset"])); | ||
231 | |||
232 | if (Data.ContainsKey("SocksItem")) | ||
233 | appearance.Wearables[AvatarWearable.SOCKS].Wear( | ||
234 | UUID.Parse(Data["SocksItem"]), | ||
235 | UUID.Parse(Data["SocksAsset"])); | ||
236 | |||
237 | if (Data.ContainsKey("JacketItem")) | ||
238 | appearance.Wearables[AvatarWearable.JACKET].Wear( | ||
239 | UUID.Parse(Data["JacketItem"]), | ||
240 | UUID.Parse(Data["JacketAsset"])); | ||
241 | |||
242 | if (Data.ContainsKey("GlovesItem")) | ||
243 | appearance.Wearables[AvatarWearable.GLOVES].Wear( | ||
244 | UUID.Parse(Data["GlovesItem"]), | ||
245 | UUID.Parse(Data["GlovesAsset"])); | ||
246 | |||
247 | if (Data.ContainsKey("UnderShirtItem")) | ||
248 | appearance.Wearables[AvatarWearable.UNDERSHIRT].Wear( | ||
249 | UUID.Parse(Data["UnderShirtItem"]), | ||
250 | UUID.Parse(Data["UnderShirtAsset"])); | ||
251 | |||
252 | if (Data.ContainsKey("UnderPantsItem")) | ||
253 | appearance.Wearables[AvatarWearable.UNDERPANTS].Wear( | ||
254 | UUID.Parse(Data["UnderPantsItem"]), | ||
255 | UUID.Parse(Data["UnderPantsAsset"])); | ||
256 | |||
257 | if (Data.ContainsKey("SkirtItem")) | ||
258 | appearance.Wearables[AvatarWearable.SKIRT].Wear( | ||
259 | UUID.Parse(Data["SkirtItem"]), | ||
260 | UUID.Parse(Data["SkirtAsset"])); | ||
261 | |||
223 | 262 | ||
224 | // Attachments | 263 | // Attachments |
225 | Dictionary<string, string> attchs = new Dictionary<string, string>(); | 264 | Dictionary<string, string> attchs = new Dictionary<string, string>(); |