aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2014-04-19 22:25:21 -0400
committerBlueWall2014-04-19 22:25:21 -0400
commit63fd027494cb796080d2a8fccf95c9e6348d7142 (patch)
tree52717f8e8ca206f51ba4fedae664247420563fa8 /OpenSim
parentIn teleports, when sending the Source region, set its ServerURI to the Gateke... (diff)
downloadopensim-SC_OLD-63fd027494cb796080d2a8fccf95c9e6348d7142.zip
opensim-SC_OLD-63fd027494cb796080d2a8fccf95c9e6348d7142.tar.gz
opensim-SC_OLD-63fd027494cb796080d2a8fccf95c9e6348d7142.tar.bz2
opensim-SC_OLD-63fd027494cb796080d2a8fccf95c9e6348d7142.tar.xz
Catch empty url error
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index b15dcf8..d05b1f6 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1123,6 +1123,9 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1123 1123
1124 assetServerURI = UserManagementModule.GetUserServerURL(avatarId, "AssetServerURI"); 1124 assetServerURI = UserManagementModule.GetUserServerURL(avatarId, "AssetServerURI");
1125 1125
1126 if(string.IsNullOrEmpty(profileServerURI) || string.IsNullOrEmpty(assetServerURI))
1127 return false;
1128
1126 OSDMap parameters= new OSDMap(); 1129 OSDMap parameters= new OSDMap();
1127 parameters.Add("avatarId", OSD.FromUUID(avatarId)); 1130 parameters.Add("avatarId", OSD.FromUUID(avatarId));
1128 OSD Params = (OSD)parameters; 1131 OSD Params = (OSD)parameters;