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 | |
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')
11 files changed, 35 insertions, 35 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); |
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs index 67fc8e6..efa60bb 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | |||
@@ -484,11 +484,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
484 | QueryDataMap.Add("GlobalZ", OSD.FromInteger((int)groupDataBlock.GlobalZ)); | 484 | QueryDataMap.Add("GlobalZ", OSD.FromInteger((int)groupDataBlock.GlobalZ)); |
485 | QueryDataMap.Add("Name", OSD.FromBinary(groupDataBlock.Name)); | 485 | QueryDataMap.Add("Name", OSD.FromBinary(groupDataBlock.Name)); |
486 | QueryDataMap.Add("OwnerID", OSD.FromUUID(groupDataBlock.OwnerID)); | 486 | QueryDataMap.Add("OwnerID", OSD.FromUUID(groupDataBlock.OwnerID)); |
487 | QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName)); | 487 | QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName)); |
488 | QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID)); | 488 | QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID)); |
489 | QueryDataMap.Add("ProductSku", OSD.FromInteger(0)); | 489 | QueryDataMap.Add("ProductSku", OSD.FromInteger(0)); |
490 | QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price)); | 490 | QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price)); |
491 | 491 | ||
492 | QueryData.Add(QueryDataMap); | 492 | QueryData.Add(QueryDataMap); |
493 | } | 493 | } |
494 | body.Add("QueryData", QueryData); | 494 | body.Add("QueryData", QueryData); |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index af72968..52add23 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
104 | List<string> serialisedParcels = new List<string>(); | 104 | List<string> serialisedParcels = new List<string>(); |
105 | string filePath = "NONE"; | 105 | string filePath = "NONE"; |
106 | 106 | ||
107 | TarArchiveReader archive = new TarArchiveReader(m_loadStream); | 107 | TarArchiveReader archive = new TarArchiveReader(m_loadStream); |
108 | byte[] data; | 108 | byte[] data; |
109 | TarArchiveReader.TarEntryType entryType; | 109 | TarArchiveReader.TarEntryType entryType; |
110 | 110 | ||
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index 75c4557..9fc6ec4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
91 | 91 | ||
92 | m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName); | 92 | m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName); |
93 | 93 | ||
94 | m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty); | 94 | m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty); |
95 | } | 95 | } |
96 | 96 | ||
97 | protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) | 97 | protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids) |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 27763bb..fc8d4e1 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
50 | /// <value> | 50 | /// <value> |
51 | /// The file used to load and save an opensimulator archive if no filename has been specified | 51 | /// The file used to load and save an opensimulator archive if no filename has been specified |
52 | /// </value> | 52 | /// </value> |
53 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; | 53 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; |
54 | 54 | ||
55 | public string Name | 55 | public string Name |
56 | { | 56 | { |
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
111 | { | 111 | { |
112 | DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty); | 112 | DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty); |
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | /// <summary> | 116 | /// <summary> |
117 | /// Save a region to a file, including all the assets needed to restore it. | 117 | /// Save a region to a file, including all the assets needed to restore it. |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index 81024db..1fbc733 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
105 | ILandObject obj = new LandObject(UUID.Zero, false, m_scene); | 105 | ILandObject obj = new LandObject(UUID.Zero, false, m_scene); |
106 | obj.LandData.Name = "NO LAND"; | 106 | obj.LandData.Name = "NO LAND"; |
107 | return obj; | 107 | return obj; |
108 | } | 108 | } |
109 | 109 | ||
110 | public List<ILandObject> AllParcels() | 110 | public List<ILandObject> AllParcels() |
111 | { | 111 | { |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9a2ef50..9b39b09 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
627 | return null; | 627 | return null; |
628 | } | 628 | } |
629 | } | 629 | } |
630 | } | 630 | } |
631 | 631 | ||
632 | #endregion | 632 | #endregion |
633 | 633 | ||
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index c9b3071..e837e9a 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -800,7 +800,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
800 | } | 800 | } |
801 | 801 | ||
802 | protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers) | 802 | protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers) |
803 | { | 803 | { |
804 | if (parcel.LandData.OwnerID == user) | 804 | if (parcel.LandData.OwnerID == user) |
805 | { | 805 | { |
806 | // Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on | 806 | // Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on |