aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2014-06-05 18:59:30 -0700
committerJustin Clark-Casey2014-06-10 20:28:29 +0100
commitbecb949a3312f3281a92002c2656736b97e75c44 (patch)
tree960c30edc049ded07247a6990526895e2c332113 /OpenSim/Region
parentUpdated Regions.ini.example to include var regions configs. (diff)
downloadopensim-SC_OLD-becb949a3312f3281a92002c2656736b97e75c44.zip
opensim-SC_OLD-becb949a3312f3281a92002c2656736b97e75c44.tar.gz
opensim-SC_OLD-becb949a3312f3281a92002c2656736b97e75c44.tar.bz2
opensim-SC_OLD-becb949a3312f3281a92002c2656736b97e75c44.tar.xz
May fix mantis #7133
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index c4b5aac..fab3978 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1152,16 +1152,21 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1152 } 1152 }
1153 1153
1154 parameters = (OSDMap)Params; 1154 parameters = (OSDMap)Params;
1155 1155
1156 OSDArray list = (OSDArray)parameters["result"]; 1156 if (parameters.ContainsKey("result"))
1157
1158 foreach(OSD asset in list)
1159 { 1157 {
1160 OSDString assetId = (OSDString)asset; 1158 OSDArray list = (OSDArray)parameters["result"];
1159
1160 foreach (OSD asset in list)
1161 {
1162 OSDString assetId = (OSDString)asset;
1161 1163
1162 Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString())); 1164 Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, assetId.AsString()));
1165 }
1166 return true;
1163 } 1167 }
1164 return true; 1168 else
1169 return false;
1165 } 1170 }
1166 1171
1167 /// <summary> 1172 /// <summary>