diff options
author | Diva Canto | 2010-01-09 09:09:32 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-09 09:09:32 -0800 |
commit | 25fdbd6cbcfc857c444042745d7d4fa8e495a982 (patch) | |
tree | d3b1479ca58d2348ba83b422dcfb5abb0bb58766 /OpenSim/Region/CoreModules | |
parent | A few more inches... Old friends things removed. Less references to UserProfi... (diff) | |
download | opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.zip opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.tar.gz opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.tar.bz2 opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.tar.xz |
Less refs to UserProfileCacheService. Compiles but likely doesn't run.
Diffstat (limited to 'OpenSim/Region/CoreModules')
4 files changed, 7 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index 61b6d65..db94d2a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
130 | } | 130 | } |
131 | else | 131 | else |
132 | { | 132 | { |
133 | string killer = DeadAvatar.Scene.CommsManager.UUIDNameRequestString(part.OwnerID); | 133 | string killer = DeadAvatar.Scene.GetUserName(part.OwnerID); |
134 | DeadAvatar.ControllingClient.SendAgentAlertMessage("You impaled yourself on " + part.Name + " owned by " + killer +"!", true); | 134 | DeadAvatar.ControllingClient.SendAgentAlertMessage("You impaled yourself on " + part.Name + " owned by " + killer +"!", true); |
135 | } | 135 | } |
136 | //DeadAvatar.Scene. part.ObjectOwner | 136 | //DeadAvatar.Scene. part.ObjectOwner |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 160a9bd..3417c87 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
357 | // Don't use the item ID that's in the file | 357 | // Don't use the item ID that's in the file |
358 | item.ID = UUID.Random(); | 358 | item.ID = UUID.Random(); |
359 | 359 | ||
360 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); | 360 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.UserAccountService); |
361 | if (UUID.Zero != ospResolvedId) | 361 | if (UUID.Zero != ospResolvedId) |
362 | { | 362 | { |
363 | item.CreatorIdAsUuid = ospResolvedId; | 363 | item.CreatorIdAsUuid = ospResolvedId; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 98b686e..8f75983 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
148 | m_userUuids[inventoryItem.CreatorIdAsUuid] = 1; | 148 | m_userUuids[inventoryItem.CreatorIdAsUuid] = 1; |
149 | 149 | ||
150 | InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone(); | 150 | InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone(); |
151 | saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_scene.CommsManager); | 151 | saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_scene.UserAccountService); |
152 | 152 | ||
153 | string serialization = UserInventoryItemSerializer.Serialize(saveItem); | 153 | string serialization = UserInventoryItemSerializer.Serialize(saveItem); |
154 | m_archiveWriter.WriteFile(filename, serialization); | 154 | m_archiveWriter.WriteFile(filename, serialization); |
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index b1dcb14..5b82d4c 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -649,16 +649,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
649 | lsri.TaskID = sog.UUID; | 649 | lsri.TaskID = sog.UUID; |
650 | lsri.TaskLocalID = sog.LocalId; | 650 | lsri.TaskLocalID = sog.LocalId; |
651 | lsri.TaskName = sog.GetPartName(obj); | 651 | lsri.TaskName = sog.GetPartName(obj); |
652 | if (m_scene.CommsManager.UUIDNameCachedTest(sog.OwnerID)) | 652 | lsri.OwnerName = "waiting"; |
653 | { | 653 | lock (uuidNameLookupList) |
654 | lsri.OwnerName = m_scene.CommsManager.UUIDNameRequestString(sog.OwnerID); | 654 | uuidNameLookupList.Add(sog.OwnerID); |
655 | } | ||
656 | else | ||
657 | { | ||
658 | lsri.OwnerName = "waiting"; | ||
659 | lock (uuidNameLookupList) | ||
660 | uuidNameLookupList.Add(sog.OwnerID); | ||
661 | } | ||
662 | 655 | ||
663 | if (filter.Length != 0) | 656 | if (filter.Length != 0) |
664 | { | 657 | { |
@@ -709,7 +702,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
709 | for (int i = 0; i < uuidarr.Length; i++) | 702 | for (int i = 0; i < uuidarr.Length; i++) |
710 | { | 703 | { |
711 | // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); | 704 | // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); |
712 | m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); | 705 | m_scene.GetUserName(uuidarr[i]); |
713 | // we drop it. It gets cached though... so we're ready for the next request. | 706 | // we drop it. It gets cached though... so we're ready for the next request. |
714 | } | 707 | } |
715 | } | 708 | } |