ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of bugs with Appearance. Appearance is all good now.

Browse Source
This commit is contained in:
Diva Canto
2010-01-11 17:30:05 -08:00
parent 4e7c449c5a
commit 77e43f4801
16 changed files with 124 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@@ -1397,7 +1397,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
AvatarAppearance ava = null;
AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca);
if (avatar != null)
ava = avatar.ToAvatarAppearance();
ava = avatar.ToAvatarAppearance(srca);
// If the model has no associated appearance we're done.
@@ -1639,7 +1639,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
// While the inventory is being fetched, setup for appearance processing
AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID);
if (adata != null)
mava = adata.ToAvatarAppearance();
mava = adata.ToAvatarAppearance(ID);
else
mava = new AvatarAppearance();

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@@ -304,7 +304,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
String.Format("appearance data not found for user {0} {1}",
rdata.userProfile.FirstName, rdata.userProfile.SurName));
}
rdata.userAppearance = adata.ToAvatarAppearance();
rdata.userAppearance = adata.ToAvatarAppearance(rdata.userProfile.ID);
rdata.initXmlWriter();
@@ -446,7 +446,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (adata != null)
{
AvatarAppearance old = adata.ToAvatarAppearance();
AvatarAppearance old = adata.ToAvatarAppearance(rdata.userProfile.ID);
rdata.userAppearance = new AvatarAppearance();
rdata.userAppearance.Owner = old.Owner;
adata = new AvatarData(rdata.userAppearance);