diff options
author | Sean Dague | 2008-05-15 18:42:27 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-15 18:42:27 +0000 |
commit | 4ff4475d02a26805749897bc62feddcc21b1c5da (patch) | |
tree | 0507ff54842f641d6f0e2664d02ac81e67190a97 /OpenSim/Framework/Communications | |
parent | add the rest of my UserAppearance created methods to (diff) | |
download | opensim-SC-4ff4475d02a26805749897bc62feddcc21b1c5da.zip opensim-SC-4ff4475d02a26805749897bc62feddcc21b1c5da.tar.gz opensim-SC-4ff4475d02a26805749897bc62feddcc21b1c5da.tar.bz2 opensim-SC-4ff4475d02a26805749897bc62feddcc21b1c5da.tar.xz |
remove my UserAppearance object, switch all code to use
AvatarAppearance instead.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/IUserService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs index f8d5541..7d71d02 100644 --- a/OpenSim/Framework/Communications/IUserService.cs +++ b/OpenSim/Framework/Communications/IUserService.cs | |||
@@ -111,9 +111,9 @@ namespace OpenSim.Framework.Communications | |||
111 | 111 | ||
112 | /// <summary> | 112 | /// <summary> |
113 | /// Get's the User Appearance | 113 | /// Get's the User Appearance |
114 | UserAppearance GetUserAppearance(LLUUID user); | 114 | AvatarAppearance GetUserAppearance(LLUUID user); |
115 | 115 | ||
116 | void UpdateUserAppearance(LLUUID user, UserAppearance appearance); | 116 | void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); |
117 | 117 | ||
118 | void AddAttachment(LLUUID user, LLUUID attach); | 118 | void AddAttachment(LLUUID user, LLUUID attach); |
119 | 119 | ||
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 51a5036..8e0b75c 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -598,7 +598,7 @@ namespace OpenSim.Framework.Communications | |||
598 | 598 | ||
599 | /// Appearance | 599 | /// Appearance |
600 | /// TODO: stubs for now to get us to a compiling state gently | 600 | /// TODO: stubs for now to get us to a compiling state gently |
601 | public UserAppearance GetUserAppearance(LLUUID user) | 601 | public AvatarAppearance GetUserAppearance(LLUUID user) |
602 | { | 602 | { |
603 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 603 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
604 | { | 604 | { |
@@ -611,10 +611,10 @@ namespace OpenSim.Framework.Communications | |||
611 | m_log.InfoFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Key, e.ToString()); | 611 | m_log.InfoFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Key, e.ToString()); |
612 | } | 612 | } |
613 | } | 613 | } |
614 | return new UserAppearance(); | 614 | return new AvatarAppearance(); |
615 | } | 615 | } |
616 | 616 | ||
617 | public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) | 617 | public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) |
618 | { | 618 | { |
619 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 619 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
620 | { | 620 | { |