diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 27def3d..11c2030 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
669 | /// <param name="nextOwnerMask"></param> | 669 | /// <param name="nextOwnerMask"></param> |
670 | public void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask) | 670 | public void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask) |
671 | { | 671 | { |
672 | CachedUserInfo userInfo = commsManager.UserProfilesCache.GetUserDetails(remoteClient.AgentId); | 672 | CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); |
673 | if (userInfo != null) | 673 | if (userInfo != null) |
674 | { | 674 | { |
675 | AssetBase asset = new AssetBase(); | 675 | AssetBase asset = new AssetBase(); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 9849145..0e25e54 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -546,7 +546,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
546 | m_estateManager.sendRegionHandshake(client); | 546 | m_estateManager.sendRegionHandshake(client); |
547 | CreateAndAddScenePresence(client); | 547 | CreateAndAddScenePresence(client); |
548 | m_LandManager.sendParcelOverlay(client); | 548 | m_LandManager.sendParcelOverlay(client); |
549 | // commsManager.UserProfilesCache.AddNewUser(client.AgentId); | 549 | //commsManager.UserProfiles.AddNewUser(client.AgentId); |
550 | } | 550 | } |
551 | 551 | ||
552 | protected virtual void SubscribeToClientEvents(IClientAPI client) | 552 | protected virtual void SubscribeToClientEvents(IClientAPI client) |
@@ -591,9 +591,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
591 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 591 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
592 | 592 | ||
593 | // client.OnCreateNewInventoryItem += CreateNewInventoryItem; | 593 | // client.OnCreateNewInventoryItem += CreateNewInventoryItem; |
594 | // client.OnCreateNewInventoryFolder += commsManager.UserProfilesCache.HandleCreateInventoryFolder; | 594 | //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; |
595 | // client.OnFetchInventoryDescendents += commsManager.UserProfilesCache.HandleFecthInventoryDescendents; | 595 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; |
596 | // client.OnRequestTaskInventory += RequestTaskInventory; | 596 | client.OnRequestTaskInventory += RequestTaskInventory; |
597 | } | 597 | } |
598 | 598 | ||
599 | protected ScenePresence CreateAndAddScenePresence(IClientAPI client) | 599 | protected ScenePresence CreateAndAddScenePresence(IClientAPI client) |