aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2010-10-30 00:41:36 +0100
committerMelanie2010-10-30 00:41:36 +0100
commit818ed2032aa4e6c0a9ede3598d64f0c7960135c4 (patch)
treeeceb29a75d784b083cdf721418a13fe8ea372963 /OpenSim/Services
parentRename the new default texture to be consistent with the others (diff)
downloadopensim-SC_OLD-818ed2032aa4e6c0a9ede3598d64f0c7960135c4.zip
opensim-SC_OLD-818ed2032aa4e6c0a9ede3598d64f0c7960135c4.tar.gz
opensim-SC_OLD-818ed2032aa4e6c0a9ede3598d64f0c7960135c4.tar.bz2
opensim-SC_OLD-818ed2032aa4e6c0a9ede3598d64f0c7960135c4.tar.xz
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs53
-rw-r--r--OpenSim/Services/Interfaces/IAvatarService.cs132
2 files changed, 105 insertions, 80 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index ea9b4b4..7a28c2b 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -265,32 +265,33 @@ namespace OpenSim.Services.Connectors.SimianGrid
265 265
266 map["Height"] = OSD.FromReal(appearance.AvatarHeight); 266 map["Height"] = OSD.FromReal(appearance.AvatarHeight);
267 267
268 map["ShapeItem"] = OSD.FromUUID(appearance.BodyItem); 268 map["BodyItem"] = appearance.Wearables[AvatarWearable.BODY][0].ItemID.ToString();
269 map["ShapeAsset"] = OSD.FromUUID(appearance.BodyAsset); 269 map["EyesItem"] = appearance.Wearables[AvatarWearable.EYES][0].ItemID.ToString();
270 map["SkinItem"] = OSD.FromUUID(appearance.SkinItem); 270 map["GlovesItem"] = appearance.Wearables[AvatarWearable.GLOVES][0].ItemID.ToString();
271 map["SkinAsset"] = OSD.FromUUID(appearance.SkinAsset); 271 map["HairItem"] = appearance.Wearables[AvatarWearable.HAIR][0].ItemID.ToString();
272 map["HairItem"] = OSD.FromUUID(appearance.HairItem); 272 map["JacketItem"] = appearance.Wearables[AvatarWearable.JACKET][0].ItemID.ToString();
273 map["HairAsset"] = OSD.FromUUID(appearance.HairAsset); 273 map["PantsItem"] = appearance.Wearables[AvatarWearable.PANTS][0].ItemID.ToString();
274 map["EyesItem"] = OSD.FromUUID(appearance.EyesItem); 274 map["ShirtItem"] = appearance.Wearables[AvatarWearable.SHIRT][0].ItemID.ToString();
275 map["EyesAsset"] = OSD.FromUUID(appearance.EyesAsset); 275 map["ShoesItem"] = appearance.Wearables[AvatarWearable.SHOES][0].ItemID.ToString();
276 map["ShirtItem"] = OSD.FromUUID(appearance.ShirtItem); 276 map["SkinItem"] = appearance.Wearables[AvatarWearable.SKIN][0].ItemID.ToString();
277 map["ShirtAsset"] = OSD.FromUUID(appearance.ShirtAsset); 277 map["SkirtItem"] = appearance.Wearables[AvatarWearable.SKIRT][0].ItemID.ToString();
278 map["PantsItem"] = OSD.FromUUID(appearance.PantsItem); 278 map["SocksItem"] = appearance.Wearables[AvatarWearable.SOCKS][0].ItemID.ToString();
279 map["PantsAsset"] = OSD.FromUUID(appearance.PantsAsset); 279 map["UnderPantsItem"] = appearance.Wearables[AvatarWearable.UNDERPANTS][0].ItemID.ToString();
280 map["ShoesItem"] = OSD.FromUUID(appearance.ShoesItem); 280 map["UnderShirtItem"] = appearance.Wearables[AvatarWearable.UNDERSHIRT][0].ItemID.ToString();
281 map["ShoesAsset"] = OSD.FromUUID(appearance.ShoesAsset); 281 map["BodyAsset"] = appearance.Wearables[AvatarWearable.BODY][0].AssetID.ToString();
282 map["SocksItem"] = OSD.FromUUID(appearance.SocksItem); 282 map["EyesAsset"] = appearance.Wearables[AvatarWearable.EYES][0].AssetID.ToString();
283 map["SocksAsset"] = OSD.FromUUID(appearance.SocksAsset); 283 map["GlovesAsset"] = appearance.Wearables[AvatarWearable.GLOVES][0].AssetID.ToString();
284 map["JacketItem"] = OSD.FromUUID(appearance.JacketItem); 284 map["HairAsset"] = appearance.Wearables[AvatarWearable.HAIR][0].AssetID.ToString();
285 map["JacketAsset"] = OSD.FromUUID(appearance.JacketAsset); 285 map["JacketAsset"] = appearance.Wearables[AvatarWearable.JACKET][0].AssetID.ToString();
286 map["GlovesItem"] = OSD.FromUUID(appearance.GlovesItem); 286 map["PantsAsset"] = appearance.Wearables[AvatarWearable.PANTS][0].AssetID.ToString();
287 map["GlovesAsset"] = OSD.FromUUID(appearance.GlovesAsset); 287 map["ShirtAsset"] = appearance.Wearables[AvatarWearable.SHIRT][0].AssetID.ToString();
288 map["UndershirtItem"] = OSD.FromUUID(appearance.UnderShirtItem); 288 map["ShoesAsset"] = appearance.Wearables[AvatarWearable.SHOES][0].AssetID.ToString();
289 map["UndershirtAsset"] = OSD.FromUUID(appearance.UnderShirtAsset); 289 map["SkinAsset"] = appearance.Wearables[AvatarWearable.SKIN][0].AssetID.ToString();
290 map["UnderpantsItem"] = OSD.FromUUID(appearance.UnderPantsItem); 290 map["SkirtAsset"] = appearance.Wearables[AvatarWearable.SKIRT][0].AssetID.ToString();
291 map["UnderpantsAsset"] = OSD.FromUUID(appearance.UnderPantsAsset); 291 map["SocksAsset"] = appearance.Wearables[AvatarWearable.SOCKS][0].AssetID.ToString();
292 map["SkirtItem"] = OSD.FromUUID(appearance.SkirtItem); 292 map["UnderPantsAsset"] = appearance.Wearables[AvatarWearable.UNDERPANTS][0].AssetID.ToString();
293 map["SkirtAsset"] = OSD.FromUUID(appearance.SkirtAsset); 293 map["UnderShirtAsset"] = appearance.Wearables[AvatarWearable.UNDERSHIRT][0].AssetID.ToString();
294
294 295
295 OSDMap items = new OSDMap(); 296 OSDMap items = new OSDMap();
296 foreach (KeyValuePair<string, string> kvp in avatar.Data) 297 foreach (KeyValuePair<string, string> kvp in avatar.Data)
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index eaa6534..a029fbc 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();
@@ -193,33 +193,57 @@ namespace OpenSim.Services.Interfaces
193 appearance.Serial = Int32.Parse(Data["Serial"]); 193 appearance.Serial = Int32.Parse(Data["Serial"]);
194 194
195 // Wearables 195 // Wearables
196 appearance.BodyItem = UUID.Parse(Data["BodyItem"]); 196 appearance.Wearables[AvatarWearable.BODY].Wear(
197 appearance.EyesItem = UUID.Parse(Data["EyesItem"]); 197 UUID.Parse(Data["BodyItem"]),
198 appearance.GlovesItem = UUID.Parse(Data["GlovesItem"]); 198 UUID.Parse(Data["BodyAsset"]));
199 appearance.HairItem = UUID.Parse(Data["HairItem"]); 199
200 appearance.JacketItem = UUID.Parse(Data["JacketItem"]); 200 appearance.Wearables[AvatarWearable.SKIN].Wear(
201 appearance.PantsItem = UUID.Parse(Data["PantsItem"]); 201 UUID.Parse(Data["SkinItem"]),
202 appearance.ShirtItem = UUID.Parse(Data["ShirtItem"]); 202 UUID.Parse(Data["SkinAsset"]));
203 appearance.ShoesItem = UUID.Parse(Data["ShoesItem"]); 203
204 appearance.SkinItem = UUID.Parse(Data["SkinItem"]); 204 appearance.Wearables[AvatarWearable.HAIR].Wear(
205 appearance.SkirtItem = UUID.Parse(Data["SkirtItem"]); 205 UUID.Parse(Data["HairItem"]),
206 appearance.SocksItem = UUID.Parse(Data["SocksItem"]); 206 UUID.Parse(Data["HairAsset"]));
207 appearance.UnderPantsItem = UUID.Parse(Data["UnderPantsItem"]); 207
208 appearance.UnderShirtItem = UUID.Parse(Data["UnderShirtItem"]); 208 appearance.Wearables[AvatarWearable.EYES].Wear(
209 209 UUID.Parse(Data["EyesItem"]),
210 appearance.BodyAsset = UUID.Parse(Data["BodyAsset"]); 210 UUID.Parse(Data["EyesAsset"]));
211 appearance.EyesAsset = UUID.Parse(Data["EyesAsset"]); 211
212 appearance.GlovesAsset = UUID.Parse(Data["GlovesAsset"]); 212 appearance.Wearables[AvatarWearable.SHIRT].Wear(
213 appearance.HairAsset = UUID.Parse(Data["HairAsset"]); 213 UUID.Parse(Data["ShirtItem"]),
214 appearance.JacketAsset = UUID.Parse(Data["JacketAsset"]); 214 UUID.Parse(Data["ShirtAsset"]));
215 appearance.PantsAsset = UUID.Parse(Data["PantsAsset"]); 215
216 appearance.ShirtAsset = UUID.Parse(Data["ShirtAsset"]); 216 appearance.Wearables[AvatarWearable.PANTS].Wear(
217 appearance.ShoesAsset = UUID.Parse(Data["ShoesAsset"]); 217 UUID.Parse(Data["PantsItem"]),
218 appearance.SkinAsset = UUID.Parse(Data["SkinAsset"]); 218 UUID.Parse(Data["PantsAsset"]));
219 appearance.SkirtAsset = UUID.Parse(Data["SkirtAsset"]); 219
220 appearance.SocksAsset = UUID.Parse(Data["SocksAsset"]); 220 appearance.Wearables[AvatarWearable.SHOES].Wear(
221 appearance.UnderPantsAsset = UUID.Parse(Data["UnderPantsAsset"]); 221 UUID.Parse(Data["ShoesItem"]),
222 appearance.UnderShirtAsset = UUID.Parse(Data["UnderShirtAsset"]); 222 UUID.Parse(Data["ShoesAsset"]));
223
224 appearance.Wearables[AvatarWearable.SOCKS].Wear(
225 UUID.Parse(Data["SocksItem"]),
226 UUID.Parse(Data["SocksAsset"]));
227
228 appearance.Wearables[AvatarWearable.JACKET].Wear(
229 UUID.Parse(Data["JacketItem"]),
230 UUID.Parse(Data["JacketAsset"]));
231
232 appearance.Wearables[AvatarWearable.GLOVES].Wear(
233 UUID.Parse(Data["GlovesItem"]),
234 UUID.Parse(Data["GlovesAsset"]));
235
236 appearance.Wearables[AvatarWearable.UNDERSHIRT].Wear(
237 UUID.Parse(Data["UnderShirtItem"]),
238 UUID.Parse(Data["UnderShirtAsset"]));
239
240 appearance.Wearables[AvatarWearable.UNDERPANTS].Wear(
241 UUID.Parse(Data["UnderPantsItem"]),
242 UUID.Parse(Data["UnderPantsAsset"]));
243
244 appearance.Wearables[AvatarWearable.SKIRT].Wear(
245 UUID.Parse(Data["SkirtItem"]),
246 UUID.Parse(Data["SkirtAsset"]));
223 247
224 // Attachments 248 // Attachments
225 Dictionary<string, string> attchs = new Dictionary<string, string>(); 249 Dictionary<string, string> attchs = new Dictionary<string, string>();
generated by cgit v1.1 at 2024-11-11 10:39:56 +0000