aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorJeff Ames2010-10-04 21:28:17 -0400
committerJeff Ames2010-10-04 21:28:17 -0400
commitbc9f793a92ab9b27a4cf3251fe586da70af03d42 (patch)
tree0a0e8fc19f4d52d2a6157ef5881439fde58493dd /OpenSim/Region/CoreModules/Avatar
parentFormatting cleanup. (diff)
downloadopensim-SC-bc9f793a92ab9b27a4cf3251fe586da70af03d42.zip
opensim-SC-bc9f793a92ab9b27a4cf3251fe586da70af03d42.tar.gz
opensim-SC-bc9f793a92ab9b27a4cf3251fe586da70af03d42.tar.bz2
opensim-SC-bc9f793a92ab9b27a4cf3251fe586da70af03d42.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs12
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 28c50ab..457e0bb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
307 /// <param name="remoteClient"></param> 307 /// <param name="remoteClient"></param>
308 /// <param name="itemID"></param> 308 /// <param name="itemID"></param>
309 /// <param name="AttachmentPt"></param> 309 /// <param name="AttachmentPt"></param>
310 /// <returns></returns> 310 /// <returns></returns>
311 protected UUID ShowAttachInUserInventory( 311 protected UUID ShowAttachInUserInventory(
312 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 312 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
313 { 313 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 7a21d5e..b3f0a25 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -318,12 +318,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
318 318
319 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID); 319 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID);
320 320
321 PresenceInfo presence = null; 321 PresenceInfo presence = null;
322 PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); 322 PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
323 if (presences != null && presences.Length > 0) 323 if (presences != null && presences.Length > 0)
324 presence = presences[0]; 324 presence = presences[0];
325 if (presence != null) 325 if (presence != null)
326 im.offline = 0; 326 im.offline = 0;
327 327
328 im.fromAgentID = fromAgentID.Guid; 328 im.fromAgentID = fromAgentID.Guid;
329 im.fromAgentName = account.FirstName + " " + account.LastName; 329 im.fromAgentName = account.FirstName + " " + account.LastName;