aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2016-12-15 00:08:36 +0000
committerUbitUmarov2016-12-15 00:08:36 +0000
commit1fd0178e8e1b1eda61898c87373a5234bd85fde4 (patch)
treeaa74b5be69041595b31e7d91f9e3ef2f2cc2ec23 /OpenSim/Region/CoreModules
parent correct the new npc entries in osslEnable.ini (diff)
downloadopensim-SC-1fd0178e8e1b1eda61898c87373a5234bd85fde4.zip
opensim-SC-1fd0178e8e1b1eda61898c87373a5234bd85fde4.tar.gz
opensim-SC-1fd0178e8e1b1eda61898c87373a5234bd85fde4.tar.bz2
opensim-SC-1fd0178e8e1b1eda61898c87373a5234bd85fde4.tar.xz
give regions a option to block profile web urls, so users are not sent to unknown web sites set by other users
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index c505d94..1f7db64 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -69,6 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
69 Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>(); 69 Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>();
70 70
71 private JsonRpcRequestManager rpc = new JsonRpcRequestManager(); 71 private JsonRpcRequestManager rpc = new JsonRpcRequestManager();
72 private bool m_allowUserProfileWebURLs = true;
72 73
73 public Scene Scene 74 public Scene Scene
74 { 75 {
@@ -159,7 +160,8 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
159 Enabled = false; 160 Enabled = false;
160 return; 161 return;
161 } 162 }
162 163
164 m_allowUserProfileWebURLs = profileConfig.GetBoolean("AllowUserProfileWebURLs", m_allowUserProfileWebURLs);
163 m_log.Debug("[PROFILES]: Full Profiles Enabled"); 165 m_log.Debug("[PROFILES]: Full Profiles Enabled");
164 ReplaceableInterface = null; 166 ReplaceableInterface = null;
165 Enabled = true; 167 Enabled = true;
@@ -1089,6 +1091,10 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1089 if(p != null && !p.IsDeleted) 1091 if(p != null && !p.IsDeleted)
1090 flags |= 0x10; 1092 flags |= 0x10;
1091 1093
1094
1095 if(!m_allowUserProfileWebURLs)
1096 props.WebUrl ="";
1097
1092 remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, membershipType , props.FirstLifeText, flags, 1098 remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, membershipType , props.FirstLifeText, flags,
1093 props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId); 1099 props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId);
1094 1100
@@ -1119,6 +1125,9 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1119 prop.FirstLifeImageId = newProfile.FirstLifeImage; 1125 prop.FirstLifeImageId = newProfile.FirstLifeImage;
1120 prop.FirstLifeText = newProfile.FirstLifeAboutText; 1126 prop.FirstLifeText = newProfile.FirstLifeAboutText;
1121 1127
1128 if(!m_allowUserProfileWebURLs)
1129 prop.WebUrl ="";
1130
1122 string serverURI = string.Empty; 1131 string serverURI = string.Empty;
1123 GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 1132 GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
1124 1133