diff options
author | Diva Canto | 2013-07-11 10:21:20 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-11 10:21:20 -0700 |
commit | c4f1ec1fd643ab3748235dfb89bc1e66165558f9 (patch) | |
tree | b303acf04ee9f6d6313cacc1542881c4614058d3 /OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-c4f1ec1fd643ab3748235dfb89bc1e66165558f9.zip opensim-SC_OLD-c4f1ec1fd643ab3748235dfb89bc1e66165558f9.tar.gz opensim-SC_OLD-c4f1ec1fd643ab3748235dfb89bc1e66165558f9.tar.bz2 opensim-SC_OLD-c4f1ec1fd643ab3748235dfb89bc1e66165558f9.tar.xz |
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 161f160..c04098c 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -173,7 +173,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
173 | if(obj.PresenceType == PresenceType.Npc) | 173 | if(obj.PresenceType == PresenceType.Npc) |
174 | return; | 174 | return; |
175 | 175 | ||
176 | GetImageAssets(((IScenePresence)obj).UUID); | 176 | Util.FireAndForget(delegate |
177 | { | ||
178 | GetImageAssets(((IScenePresence)obj).UUID); | ||
179 | }); | ||
177 | } | 180 | } |
178 | 181 | ||
179 | /// <summary> | 182 | /// <summary> |
@@ -1044,12 +1047,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
1044 | { | 1047 | { |
1045 | OSDString assetId = (OSDString)asset; | 1048 | OSDString assetId = (OSDString)asset; |
1046 | 1049 | ||
1047 | Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()), this, | 1050 | Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString())); |
1048 | delegate (string assetID, Object s, AssetBase a) | ||
1049 | { | ||
1050 | // m_log.DebugFormat("[PROFILES]: Getting Image Assets {0}", assetID); | ||
1051 | return; | ||
1052 | }); | ||
1053 | } | 1051 | } |
1054 | return true; | 1052 | return true; |
1055 | } | 1053 | } |