aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2007-12-01 14:31:21 +0000
committerMW2007-12-01 14:31:21 +0000
commitc28f505caa8e686276434ca3608adf772e2b5882 (patch)
treef20cc4958c1dd9f9a872e701940ef27cc022e111 /OpenSim/Region/Environment
parentthe fix, so that trunk works again (diff)
downloadopensim-SC_OLD-c28f505caa8e686276434ca3608adf772e2b5882.zip
opensim-SC_OLD-c28f505caa8e686276434ca3608adf772e2b5882.tar.gz
opensim-SC_OLD-c28f505caa8e686276434ca3608adf772e2b5882.tar.bz2
opensim-SC_OLD-c28f505caa8e686276434ca3608adf772e2b5882.tar.xz
small bit of refactoring
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index d8a90c5..820a26b 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -2,6 +2,7 @@ using System;
2using libsecondlife; 2using libsecondlife;
3using Nini.Config; 3using Nini.Config;
4using OpenSim.Framework; 4using OpenSim.Framework;
5using OpenSim.Framework.Communications.Cache;
5using OpenSim.Region.Environment.Interfaces; 6using OpenSim.Region.Environment.Interfaces;
6using OpenSim.Region.Environment.Scenes; 7using OpenSim.Region.Environment.Scenes;
7 8
@@ -64,7 +65,16 @@ namespace OpenSim.Region.Environment.Modules
64 // then store assetid and itemId and wearable type in a database 65 // then store assetid and itemId and wearable type in a database
65 foreach (AvatarWearingArgs.Wearable wear in e.NowWearing) 66 foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
66 { 67 {
67 LLUUID assetID = m_scene.CommsManager.UserProfileCache.GetUserDetails(clientView.AgentId).RootFolder.HasItem(wear.ItemID).assetID; 68 LLUUID assetId;
69 CachedUserInfo profile = m_scene.CommsManager.UserProfileCache.GetUserDetails(clientView.AgentId);
70 if (profile != null)
71 {
72 InventoryItemBase baseItem = profile.RootFolder.HasItem(wear.ItemID);
73 if (baseItem != null)
74 {
75 assetId = baseItem.assetID;
76 }
77 }
68 } 78 }
69 } 79 }
70 80