diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/Avatar/Profiles | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index 20b1c1c..f9c0dcf 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles | |||
90 | /// </summary> | 90 | /// </summary> |
91 | /// <param name="remoteClient"></param> | 91 | /// <param name="remoteClient"></param> |
92 | /// <param name="avatarID"></param> | 92 | /// <param name="avatarID"></param> |
93 | public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID) | 93 | public void RequestAvatarProperty(IClientAPI remoteClient, UUID avatarID) |
94 | { | 94 | { |
95 | // FIXME: finish adding fields such as url, masking, etc. | 95 | // FIXME: finish adding fields such as url, masking, etc. |
96 | UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); | 96 | UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); |
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles | |||
104 | } | 104 | } |
105 | else | 105 | else |
106 | { | 106 | { |
107 | charterMember = Helpers.StringToField(profile.CustomType); | 107 | charterMember = Utils.StringToBytes(profile.CustomType); |
108 | } | 108 | } |
109 | 109 | ||
110 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, | 110 | remoteClient.SendAvatarProperties(profile.ID, profile.AboutText, |