diff options
author | Jeff Ames | 2010-01-04 06:10:45 +0900 |
---|---|---|
committer | Jeff Ames | 2010-01-04 06:17:30 +0900 |
commit | 70d5b1c34cf2eb6621f383169fdee03966850762 (patch) | |
tree | 18bf786a4c0897cb24fa9ceef5f53d5ce345a78f /OpenSim/Region/CoreModules/Avatar | |
parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
download | opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.zip opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.gz opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.bz2 opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.xz |
Formatting cleanup. Add copyright headers.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
4 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 580e06f..a4a649c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -1119,23 +1119,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
1119 | } | 1119 | } |
1120 | public void FindAgent(IClientAPI remoteClient, UUID hunter, UUID target) | 1120 | public void FindAgent(IClientAPI remoteClient, UUID hunter, UUID target) |
1121 | { | 1121 | { |
1122 | List<FriendListItem> friendList = GetUserFriends(hunter); | 1122 | List<FriendListItem> friendList = GetUserFriends(hunter); |
1123 | foreach (FriendListItem item in friendList) | 1123 | foreach (FriendListItem item in friendList) |
1124 | { | 1124 | { |
1125 | if(item.onlinestatus == true) | 1125 | if (item.onlinestatus == true) |
1126 | { | 1126 | { |
1127 | if(item.Friend == target && (item.FriendPerms & (uint)FriendRights.CanSeeOnMap) != 0) | 1127 | if (item.Friend == target && (item.FriendPerms & (uint)FriendRights.CanSeeOnMap) != 0) |
1128 | { | 1128 | { |
1129 | ScenePresence SPTarget = ((Scene)remoteClient.Scene).GetScenePresence(target); | 1129 | ScenePresence SPTarget = ((Scene)remoteClient.Scene).GetScenePresence(target); |
1130 | string regionname = SPTarget.Scene.RegionInfo.RegionName; | 1130 | string regionname = SPTarget.Scene.RegionInfo.RegionName; |
1131 | remoteClient.SendScriptTeleportRequest("FindAgent", regionname,new Vector3(SPTarget.AbsolutePosition),new Vector3(SPTarget.Lookat)); | 1131 | remoteClient.SendScriptTeleportRequest("FindAgent", regionname,new Vector3(SPTarget.AbsolutePosition),new Vector3(SPTarget.Lookat)); |
1132 | } | 1132 | } |
1133 | } | 1133 | } |
1134 | else | 1134 | else |
1135 | { | 1135 | { |
1136 | remoteClient.SendAgentAlertMessage("The agent you are looking for is not online.", false); | 1136 | remoteClient.SendAgentAlertMessage("The agent you are looking for is not online.", false); |
1137 | } | 1137 | } |
1138 | } | 1138 | } |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | public List<FriendListItem> GetUserFriends(UUID agentID) | 1141 | public List<FriendListItem> GetUserFriends(UUID agentID) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 7e1bed5..50171a3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
118 | 118 | ||
119 | m_scene.ForEachClient( | 119 | m_scene.ForEachClient( |
120 | delegate(IClientAPI controller) | 120 | delegate(IClientAPI controller) |
121 | { | 121 | { |
122 | if (controller.AgentId != godID) | 122 | if (controller.AgentId != godID) |
123 | controller.Kick(reasonStr); | 123 | controller.Kick(reasonStr); |
124 | } | 124 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 0ced2f9..160a9bd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -359,12 +359,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
359 | 359 | ||
360 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); | 360 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); |
361 | if (UUID.Zero != ospResolvedId) | 361 | if (UUID.Zero != ospResolvedId) |
362 | { | 362 | { |
363 | item.CreatorIdAsUuid = ospResolvedId; | 363 | item.CreatorIdAsUuid = ospResolvedId; |
364 | 364 | ||
365 | // XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the | 365 | // XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the |
366 | // database). Instead, replace with the UUID that we found. | 366 | // database). Instead, replace with the UUID that we found. |
367 | item.CreatorId = ospResolvedId.ToString(); | 367 | item.CreatorId = ospResolvedId.ToString(); |
368 | } | 368 | } |
369 | else | 369 | else |
370 | { | 370 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index c85d974..98b686e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -117,12 +117,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
117 | } | 117 | } |
118 | 118 | ||
119 | protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) | 119 | protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) |
120 | { | 120 | { |
121 | Exception reportedException = null; | 121 | Exception reportedException = null; |
122 | bool succeeded = true; | 122 | bool succeeded = true; |
123 | 123 | ||
124 | try | 124 | try |
125 | { | 125 | { |
126 | // We're almost done. Just need to write out the control file now | 126 | // We're almost done. Just need to write out the control file now |
127 | m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p1ControlFile()); | 127 | m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p1ControlFile()); |
128 | m_log.InfoFormat("[ARCHIVER]: Added control file to archive."); | 128 | m_log.InfoFormat("[ARCHIVER]: Added control file to archive."); |
@@ -269,7 +269,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
269 | m_module.TriggerInventoryArchiveSaved( | 269 | m_module.TriggerInventoryArchiveSaved( |
270 | m_id, false, m_userInfo, m_invPath, m_saveStream, | 270 | m_id, false, m_userInfo, m_invPath, m_saveStream, |
271 | new Exception(errorMessage)); | 271 | new Exception(errorMessage)); |
272 | return; | 272 | return; |
273 | } | 273 | } |
274 | 274 | ||
275 | m_archiveWriter = new TarArchiveWriter(m_saveStream); | 275 | m_archiveWriter = new TarArchiveWriter(m_saveStream); |