diff options
author | Justin Clark-Casey (justincc) | 2011-08-02 00:13:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-02 00:13:04 +0100 |
commit | b6ac1c46cd473b129b70344f0001f1e8f97d8860 (patch) | |
tree | 46e5d02205b63d16f29b3aaf6a3ad910192aaeb6 /OpenSim/Services/Connectors | |
parent | Get osNpcCreate appearance working with avatars that are currently in the scene. (diff) | |
download | opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.zip opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.gz opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.bz2 opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.xz |
Get rid of AvatarAppearance.Owner to simplify the code.
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | 4 |
2 files changed, 3 insertions, 3 deletions
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 | ||