diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 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) |