aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Modules/AvatarFactory
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Modules/AvatarFactory
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-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 'OpenSim/Region/Modules/AvatarFactory')
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 671b854..ab86d10 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31 31
32using System.Threading; 32using System.Threading;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Data.Base; 36using OpenSim.Data.Base;
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
48 private Scene m_scene = null; 48 private Scene m_scene = null;
49 private static readonly AvatarAppearance def = new AvatarAppearance(); 49 private static readonly AvatarAppearance def = new AvatarAppearance();
50 50
51 public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) 51 public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance)
52 { 52 {
53 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); 53 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId);
54 //if ((profile != null) && (profile.RootFolder != null)) 54 //if ((profile != null) && (profile.RootFolder != null))
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
69 69
70 } 70 }
71 71
72 private AvatarAppearance CreateDefault(LLUUID avatarId) 72 private AvatarAppearance CreateDefault(UUID avatarId)
73 { 73 {
74 AvatarAppearance appearance = null; 74 AvatarAppearance appearance = null;
75 AvatarWearable[] wearables; 75 AvatarWearable[] wearables;
@@ -127,13 +127,13 @@ namespace OpenSim.Region.Modules.AvatarFactory
127 { 127 {
128 for (int i = 0; i < 13; i++) 128 for (int i = 0; i < 13; i++)
129 { 129 {
130 if (appearance.Wearables[i].ItemID == LLUUID.Zero) 130 if (appearance.Wearables[i].ItemID == UUID.Zero)
131 { 131 {
132 appearance.Wearables[i].AssetID = LLUUID.Zero; 132 appearance.Wearables[i].AssetID = UUID.Zero;
133 } 133 }
134 else 134 else
135 { 135 {
136 // LLUUID assetId; 136 // UUID assetId;
137 137
138 InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID); 138 InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID);
139 139
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
201 wearables = AvatarWearable.DefaultWearables; 201 wearables = AvatarWearable.DefaultWearables;
202 } 202 }
203 203
204 public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) 204 public void UpdateDatabase(UUID user, AvatarAppearance appearance)
205 { 205 {
206 m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance); 206 m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance);
207 } 207 }