ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2013-07-11 23:05:10 +01:00
parent 44e9849ed1 ee51a9f9c9
commit f57f49eede
4 changed files with 136 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@@ -173,7 +173,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
if(obj.PresenceType == PresenceType.Npc)
return;
GetImageAssets(((IScenePresence)obj).UUID);
Util.FireAndForget(delegate
{
GetImageAssets(((IScenePresence)obj).UUID);
});
}
/// <summary>
@@ -1044,12 +1047,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
{
OSDString assetId = (OSDString)asset;
Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()), this,
delegate (string assetID, Object s, AssetBase a)
{
// m_log.DebugFormat("[PROFILES]: Getting Image Assets {0}", assetID);
return;
});
Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()));
}
return true;
}