aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorDiva Canto2010-01-11 17:30:05 -0800
committerDiva Canto2010-01-11 17:30:05 -0800
commit77e43f480154b0a950d9d5f54df5c225fc64e77a (patch)
tree48f1806bd8b0d0f50aef89846bcc186d3ad3eb74 /OpenSim/ApplicationPlugins
parentThis fixes the problem that region modules (new style) weren't being recognized. (diff)
downloadopensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.zip
opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.tar.gz
opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.tar.bz2
opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.tar.xz
Fixed a couple of bugs with Appearance. Appearance is all good now.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index d9458af..457177d 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1397,7 +1397,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1397 AvatarAppearance ava = null; 1397 AvatarAppearance ava = null;
1398 AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca); 1398 AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca);
1399 if (avatar != null) 1399 if (avatar != null)
1400 ava = avatar.ToAvatarAppearance(); 1400 ava = avatar.ToAvatarAppearance(srca);
1401 1401
1402 // If the model has no associated appearance we're done. 1402 // If the model has no associated appearance we're done.
1403 1403
@@ -1639,7 +1639,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1639 // While the inventory is being fetched, setup for appearance processing 1639 // While the inventory is being fetched, setup for appearance processing
1640 AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID); 1640 AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID);
1641 if (adata != null) 1641 if (adata != null)
1642 mava = adata.ToAvatarAppearance(); 1642 mava = adata.ToAvatarAppearance(ID);
1643 else 1643 else
1644 mava = new AvatarAppearance(); 1644 mava = new AvatarAppearance();
1645 1645
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 5429890..b70a511 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -304,7 +304,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
304 String.Format("appearance data not found for user {0} {1}", 304 String.Format("appearance data not found for user {0} {1}",
305 rdata.userProfile.FirstName, rdata.userProfile.SurName)); 305 rdata.userProfile.FirstName, rdata.userProfile.SurName));
306 } 306 }
307 rdata.userAppearance = adata.ToAvatarAppearance(); 307 rdata.userAppearance = adata.ToAvatarAppearance(rdata.userProfile.ID);
308 308
309 rdata.initXmlWriter(); 309 rdata.initXmlWriter();
310 310
@@ -446,7 +446,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
446 446
447 if (adata != null) 447 if (adata != null)
448 { 448 {
449 AvatarAppearance old = adata.ToAvatarAppearance(); 449 AvatarAppearance old = adata.ToAvatarAppearance(rdata.userProfile.ID);
450 rdata.userAppearance = new AvatarAppearance(); 450 rdata.userAppearance = new AvatarAppearance();
451 rdata.userAppearance.Owner = old.Owner; 451 rdata.userAppearance.Owner = old.Owner;
452 adata = new AvatarData(rdata.userAppearance); 452 adata = new AvatarData(rdata.userAppearance);