diff options
Diffstat (limited to 'OpenSim/Services')
5 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs index c4c7cad..c59a9e0 100644 --- a/OpenSim/Services/AvatarService/AvatarService.cs +++ b/OpenSim/Services/AvatarService/AvatarService.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Services.AvatarService | |||
54 | public AvatarAppearance GetAppearance(UUID principalID) | 54 | public AvatarAppearance GetAppearance(UUID principalID) |
55 | { | 55 | { |
56 | AvatarData avatar = GetAvatar(principalID); | 56 | AvatarData avatar = GetAvatar(principalID); |
57 | return avatar.ToAvatarAppearance(principalID); | 57 | return avatar.ToAvatarAppearance(); |
58 | } | 58 | } |
59 | 59 | ||
60 | public bool SetAppearance(UUID principalID, AvatarAppearance appearance) | 60 | public bool SetAppearance(UUID principalID, AvatarAppearance appearance) |
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs index 1a93ae7..8fdb4d0 100644 --- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Connectors | |||
89 | public AvatarAppearance GetAppearance(UUID userID) | 89 | public AvatarAppearance GetAppearance(UUID userID) |
90 | { | 90 | { |
91 | AvatarData avatar = GetAvatar(userID); | 91 | AvatarData avatar = GetAvatar(userID); |
92 | return avatar.ToAvatarAppearance(userID); | 92 | return avatar.ToAvatarAppearance(); |
93 | } | 93 | } |
94 | 94 | ||
95 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) | 95 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index 810399c..360f0dd 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -213,7 +213,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
213 | wearables[11] = new AvatarWearable(map["UnderpantsItem"].AsUUID(), map["UnderpantsAsset"].AsUUID()); | 213 | wearables[11] = new AvatarWearable(map["UnderpantsItem"].AsUUID(), map["UnderpantsAsset"].AsUUID()); |
214 | wearables[12] = new AvatarWearable(map["SkirtItem"].AsUUID(), map["SkirtAsset"].AsUUID()); | 214 | wearables[12] = new AvatarWearable(map["SkirtItem"].AsUUID(), map["SkirtAsset"].AsUUID()); |
215 | 215 | ||
216 | AvatarAppearance appearance = new AvatarAppearance(userID); | 216 | AvatarAppearance appearance = new AvatarAppearance(); |
217 | appearance.Wearables = wearables; | 217 | appearance.Wearables = wearables; |
218 | appearance.AvatarHeight = (float)map["Height"].AsReal(); | 218 | appearance.AvatarHeight = (float)map["Height"].AsReal(); |
219 | 219 | ||
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
257 | 257 | ||
258 | if (avatar.AvatarType == 1) // LLAvatar | 258 | if (avatar.AvatarType == 1) // LLAvatar |
259 | { | 259 | { |
260 | AvatarAppearance appearance = avatar.ToAvatarAppearance(userID); | 260 | AvatarAppearance appearance = avatar.ToAvatarAppearance(); |
261 | 261 | ||
262 | OSDMap map = new OSDMap(); | 262 | OSDMap map = new OSDMap(); |
263 | 263 | ||
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index d7af562..0d5ab7d 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
@@ -180,9 +180,9 @@ namespace OpenSim.Services.Interfaces | |||
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
183 | public AvatarAppearance ToAvatarAppearance(UUID owner) | 183 | public AvatarAppearance ToAvatarAppearance() |
184 | { | 184 | { |
185 | AvatarAppearance appearance = new AvatarAppearance(owner); | 185 | AvatarAppearance appearance = new AvatarAppearance(); |
186 | 186 | ||
187 | if (Data.Count == 0) | 187 | if (Data.Count == 0) |
188 | return appearance; | 188 | return appearance; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 2b15896..00405a1 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -785,7 +785,7 @@ namespace OpenSim.Services.LLLoginService | |||
785 | if (avatar != null) | 785 | if (avatar != null) |
786 | aCircuit.Appearance = new AvatarAppearance(avatar); | 786 | aCircuit.Appearance = new AvatarAppearance(avatar); |
787 | else | 787 | else |
788 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 788 | aCircuit.Appearance = new AvatarAppearance(); |
789 | 789 | ||
790 | //aCircuit.BaseFolder = irrelevant | 790 | //aCircuit.BaseFolder = irrelevant |
791 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 791 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |