aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs60
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index df5265c..138c0f7 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
85 /// <value> 85 /// <value>
86 /// The configuration 86 /// The configuration
87 /// </value> 87 /// </value>
88 public IConfigSource Config 88 public IConfigSource Config
89 { 89 {
90 get; 90 get;
91 set; 91 set;
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
97 /// <value> 97 /// <value>
98 /// The profile server URI. 98 /// The profile server URI.
99 /// </value> 99 /// </value>
100 public string ProfileServerUri 100 public string ProfileServerUri
101 { 101 {
102 get; 102 get;
103 set; 103 set;
@@ -120,13 +120,13 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
120 /// <value> 120 /// <value>
121 /// <c>true</c> if enabled; otherwise, <c>false</c>. 121 /// <c>true</c> if enabled; otherwise, <c>false</c>.
122 /// </value> 122 /// </value>
123 public bool Enabled 123 public bool Enabled
124 { 124 {
125 get; 125 get;
126 set; 126 set;
127 } 127 }
128 128
129 public string MyGatekeeper 129 public string MyGatekeeper
130 { 130 {
131 get; private set; 131 get; private set;
132 } 132 }
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
135 /// <summary> 135 /// <summary>
136 /// This is called to initialize the region module. For shared modules, this is called exactly once, after 136 /// This is called to initialize the region module. For shared modules, this is called exactly once, after
137 /// creating the single (shared) instance. For non-shared modules, this is called once on each instance, after 137 /// creating the single (shared) instance. For non-shared modules, this is called once on each instance, after
138 /// the instace for the region has been created. 138 /// the instace for the region has been created.
139 /// </summary> 139 /// </summary>
140 /// <param name='source'> 140 /// <param name='source'>
141 /// Source. 141 /// Source.
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
162 Enabled = false; 162 Enabled = false;
163 return; 163 return;
164 } 164 }
165 165
166 m_allowUserProfileWebURLs = profileConfig.GetBoolean("AllowUserProfileWebURLs", m_allowUserProfileWebURLs); 166 m_allowUserProfileWebURLs = profileConfig.GetBoolean("AllowUserProfileWebURLs", m_allowUserProfileWebURLs);
167 167
168 m_log.Debug("[PROFILES]: Full Profiles Enabled"); 168 m_log.Debug("[PROFILES]: Full Profiles Enabled");
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
212 /// This will be called once for every scene loaded. In a shared module this will be multiple times in one 212 /// This will be called once for every scene loaded. In a shared module this will be multiple times in one
213 /// instance, while a nonshared module instance will only be called once. This method is called after AddRegion 213 /// instance, while a nonshared module instance will only be called once. This method is called after AddRegion
214 /// has been called in all modules for that scene, providing an opportunity to request another module's 214 /// has been called in all modules for that scene, providing an opportunity to request another module's
215 /// interface, or hook an event from another module. 215 /// interface, or hook an event from another module.
216 /// </summary> 216 /// </summary>
217 /// <param name='scene'> 217 /// <param name='scene'>
218 /// Scene. 218 /// Scene.
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
230 /// module has registered the interface by then, this module will be activated, else it will remain inactive, 230 /// module has registered the interface by then, this module will be activated, else it will remain inactive,
231 /// letting the other module take over. This should return non-null ONLY in modules that are intended to be 231 /// letting the other module take over. This should return non-null ONLY in modules that are intended to be
232 /// easily replaceable, e.g. stub implementations that the developer expects to be replaced by third party 232 /// easily replaceable, e.g. stub implementations that the developer expects to be replaced by third party
233 /// provided modules. 233 /// provided modules.
234 /// </summary> 234 /// </summary>
235 /// <value> 235 /// <value>
236 /// The replaceable interface. 236 /// The replaceable interface.
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
248 } 248 }
249 249
250 /// <value> 250 /// <value>
251 /// The name of the module 251 /// The name of the module
252 /// </value> 252 /// </value>
253 /// <summary> 253 /// <summary>
254 /// Gets the module name. 254 /// Gets the module name.
@@ -451,7 +451,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
451 } 451 }
452 452
453 public void ClassifiedInfoRequest(UUID queryClassifiedID, IClientAPI remoteClient) 453 public void ClassifiedInfoRequest(UUID queryClassifiedID, IClientAPI remoteClient)
454 { 454 {
455 UUID target = remoteClient.AgentId; 455 UUID target = remoteClient.AgentId;
456 UserClassifiedAdd ad = new UserClassifiedAdd(); 456 UserClassifiedAdd ad = new UserClassifiedAdd();
457 ad.ClassifiedId = queryClassifiedID; 457 ad.ClassifiedId = queryClassifiedID;
@@ -459,7 +459,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
459 lock (m_classifiedCache) 459 lock (m_classifiedCache)
460 { 460 {
461 if (m_classifiedCache.ContainsKey(queryClassifiedID)) 461 if (m_classifiedCache.ContainsKey(queryClassifiedID))
462 { 462 {
463 target = m_classifiedCache[queryClassifiedID]; 463 target = m_classifiedCache[queryClassifiedID];
464 464
465 m_classifiedInterest[queryClassifiedID] --; 465 m_classifiedInterest[queryClassifiedID] --;
@@ -870,7 +870,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
870 870
871 string theirGatekeeperURI; 871 string theirGatekeeperURI;
872 GetUserGatekeeperURI(targetID, out theirGatekeeperURI); 872 GetUserGatekeeperURI(targetID, out theirGatekeeperURI);
873 873
874 object Pick = (object)pick; 874 object Pick = (object)pick;
875 if (!rpc.JsonRpcRequest (ref Pick, "pickinforequest", serverURI, UUID.Random ().ToString ())) { 875 if (!rpc.JsonRpcRequest (ref Pick, "pickinforequest", serverURI, UUID.Random ().ToString ())) {
876 remoteClient.SendAgentAlertMessage ( 876 remoteClient.SendAgentAlertMessage (
@@ -880,11 +880,11 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
880 pick = (UserProfilePick)Pick; 880 pick = (UserProfilePick)Pick;
881 if(foreign) 881 if(foreign)
882 cacheForeignImage(targetID, pick.SnapshotId); 882 cacheForeignImage(targetID, pick.SnapshotId);
883 883
884 Vector3 globalPos = new Vector3(Vector3.Zero); 884 Vector3 globalPos = new Vector3(Vector3.Zero);
885 Vector3.TryParse(pick.GlobalPos, out globalPos); 885 Vector3.TryParse(pick.GlobalPos, out globalPos);
886 886
887 if (!string.IsNullOrWhiteSpace(MyGatekeeper) && pick.Gatekeeper != MyGatekeeper) 887 if (!string.IsNullOrWhiteSpace(MyGatekeeper) && pick.Gatekeeper != MyGatekeeper)
888 { 888 {
889 // Setup the illusion 889 // Setup the illusion
890 string region = string.Format("{0} {1}",pick.Gatekeeper,pick.SimName); 890 string region = string.Format("{0} {1}",pick.Gatekeeper,pick.SimName);
@@ -896,7 +896,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
896 } 896 }
897 else 897 else
898 { 898 {
899 // we have a proxy on map 899 // we have a proxy on map
900 ulong oriHandle; 900 ulong oriHandle;
901 uint oriX; 901 uint oriX;
902 uint oriY; 902 uint oriY;
@@ -909,7 +909,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
909 } 909 }
910 else 910 else
911 { 911 {
912 // this is a fail on large regions 912 // this is a fail on large regions
913 uint gtmp = (uint)globalPos.X >> 8; 913 uint gtmp = (uint)globalPos.X >> 8;
914 globalPos.X -= (gtmp << 8); 914 globalPos.X -= (gtmp << 8);
915 915
@@ -975,7 +975,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
975 /// Enabled. 975 /// Enabled.
976 /// </param> 976 /// </param>
977 public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled) 977 public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled)
978 { 978 {
979 m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString()); 979 m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
980 980
981 UserProfilePick pick = new UserProfilePick(); 981 UserProfilePick pick = new UserProfilePick();
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1012 else 1012 else
1013 { 1013 {
1014 m_log.WarnFormat( 1014 m_log.WarnFormat(
1015 "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}", 1015 "[PROFILES]: PickInfoUpdate found no parcel info at {0},{1} in {2}",
1016 avaPos.X, avaPos.Y, p.Scene.Name); 1016 avaPos.X, avaPos.Y, p.Scene.Name);
1017 } 1017 }
1018 1018
@@ -1146,7 +1146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1146 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes); 1146 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
1147 return; 1147 return;
1148 } 1148 }
1149 note = (UserProfileNotes) Note; 1149 note = (UserProfileNotes) Note;
1150 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes); 1150 remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
1151 } 1151 }
1152 1152
@@ -1225,10 +1225,10 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1225 { 1225 {
1226 m_log.InfoFormat("[PROFILES]: UserPreferences update error"); 1226 m_log.InfoFormat("[PROFILES]: UserPreferences update error");
1227 remoteClient.SendAgentAlertMessage("Error updating preferences", false); 1227 remoteClient.SendAgentAlertMessage("Error updating preferences", false);
1228 return; 1228 return;
1229 } 1229 }
1230 } 1230 }
1231 1231
1232 /// <summary> 1232 /// <summary>
1233 /// Users the preferences request. 1233 /// Users the preferences request.
1234 /// </summary> 1234 /// </summary>
@@ -1256,7 +1256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1256 pref = (UserPreferences) Pref; 1256 pref = (UserPreferences) Pref;
1257 1257
1258 remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail); 1258 remoteClient.SendUserInfoReply(pref.IMViaEmail, pref.Visible, pref.EMail);
1259 1259
1260 } 1260 }
1261 #endregion User Preferences 1261 #endregion User Preferences
1262 1262
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1437 { 1437 {
1438 props.AboutText ="Profile not available at this time. User may still be unknown to this grid"; 1438 props.AboutText ="Profile not available at this time. User may still be unknown to this grid";
1439 } 1439 }
1440 1440
1441 if(!m_allowUserProfileWebURLs) 1441 if(!m_allowUserProfileWebURLs)
1442 props.WebUrl =""; 1442 props.WebUrl ="";
1443 1443
@@ -1568,7 +1568,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1568 { 1568 {
1569 m_log.Debug( 1569 m_log.Debug(
1570 string.Format( 1570 string.Format(
1571 "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed", 1571 "[PROFILES]: Request using the OpenProfile API for user {0} to {1} failed",
1572 properties.UserId, serverURI), 1572 properties.UserId, serverURI),
1573 e); 1573 e);
1574 1574
@@ -1586,7 +1586,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1586 return false; 1586 return false;
1587 } 1587 }
1588 } 1588 }
1589 1589
1590 properties = (UserProfileProperties)Prop; 1590 properties = (UserProfileProperties)Prop;
1591 if(foreign) 1591 if(foreign)
1592 { 1592 {
@@ -1704,7 +1704,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1704 { 1704 {
1705 bool local; 1705 bool local;
1706 local = UserManagementModule.IsLocalGridUser(userID); 1706 local = UserManagementModule.IsLocalGridUser(userID);
1707 1707
1708 if (!local) 1708 if (!local)
1709 { 1709 {
1710 serverURI = UserManagementModule.GetUserServerURL(userID, "GatekeeperURI"); 1710 serverURI = UserManagementModule.GetUserServerURL(userID, "GatekeeperURI");
@@ -1761,13 +1761,13 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1761 1761
1762 string imageIDstr = imageID.ToString(); 1762 string imageIDstr = imageID.ToString();
1763 1763
1764 1764
1765 if(m_assetCache != null && m_assetCache.Check(imageIDstr)) 1765 if(m_assetCache != null && m_assetCache.Check(imageIDstr))
1766 return; 1766 return;
1767 1767
1768 if(Scene.AssetService.Get(imageIDstr) != null) 1768 if(Scene.AssetService.Get(imageIDstr) != null)
1769 return; 1769 return;
1770 1770
1771 Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, imageIDstr)); 1771 Scene.AssetService.Get(string.Format("{0}/{1}", assetServerURI, imageIDstr));
1772 } 1772 }
1773 1773
@@ -1876,7 +1876,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1876 1876
1877 if (mret.ContainsKey("error")) 1877 if (mret.ContainsKey("error"))
1878 return false; 1878 return false;
1879 1879
1880 // get params... 1880 // get params...
1881 OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]); 1881 OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]);
1882 return true; 1882 return true;