* OMG! All but one references to UserProfileCacheService have been rerouted!

* HG is seriously broken here
* Compiles. Untested.

3 files changed, 7 insertions, 86 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index 6f7f34f..76d7a09 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
@@ -82,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
 
         public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel)
         {
-            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(avatarID);
+            UserAccount userInfo = UserAccountService.GetUserAccount(RegionInfo.ScopeID, avatarID);
             if (userInfo != null)
             {
                 m_assMapper.Post(assetID, avatarID);
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
deleted file mode 100644
index b1981b6..0000000
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-
-namespace OpenSim.Region.Framework.Scenes.Hypergrid
-{
-    public partial class HGScene : Scene
-    {
-        /// <summary>
-        /// Teleport an avatar to their home region
-        /// </summary>
-        /// <param name="agentId"></param>
-        /// <param name="client"></param>
-        public override void TeleportClientHome(UUID agentId, IClientAPI client)
-        {
-            m_log.Debug("[HGScene]: TeleportClientHome " + client.FirstName + " " + client.LastName);
-
-            CachedUserInfo uinfo = CommsManager.UserProfileCacheService.GetUserDetails(agentId);
-            if (uinfo != null)
-            {
-                UserProfileData UserProfile = uinfo.UserProfile;
-
-                if (UserProfile != null)
-                {
-                    GridRegion regionInfo = GridService.GetRegionByUUID(UUID.Zero, UserProfile.HomeRegionID);
-                    //if (regionInfo != null)
-                    //{
-                    //    UserProfile.HomeRegionID = regionInfo.RegionID;
-                    //    //CommsManager.UserService.UpdateUserProfile(UserProfile);
-                    //}
-                    if (regionInfo == null)
-                    {
-                        // can't find the Home region: Tell viewer and abort
-                        client.SendTeleportFailed("Your home-region could not be found.");
-                        return;
-                    }
-                    RequestTeleportLocation(
-                        client, regionInfo.RegionHandle, UserProfile.HomeLocation, UserProfile.HomeLookAt,
-                        (uint)(TPFlags.SetLastToTarget | TPFlags.ViaHome));
-                }
-            }
-            else
-                client.SendTeleportFailed("Sorry! I lost your home-region information.");
-
-        }
-
-    }
-}
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index f64a7a0..61419e6 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -141,13 +141,9 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                     bool isHyperLink = (HyperlinkService.GetHyperlinkRegion(reg.RegionHandle) != null);
                     bool isHomeUser = true;
                     ulong realHandle = regionHandle;
-                    CachedUserInfo uinfo = m_commsProvider.UserProfileCacheService.GetUserDetails(avatar.UUID);
-                    if (uinfo != null)
-                    {
-                        isHomeUser = HyperlinkService.IsLocalUser(uinfo.UserProfile.ID);
-                        realHandle = m_hg.FindRegionHandle(regionHandle);
-                        m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString());
-                    }
+                    isHomeUser = HyperlinkService.IsLocalUser(avatar.UUID);
+                    realHandle = m_hg.FindRegionHandle(regionHandle);
+                    m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString());
                     ///
                     /// Hypergrid mod stop
                     /// 
@@ -352,7 +348,8 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                         // so the userinfo in UserProfileCache is not reliable any more, delete it
                         if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink)
                         {
-                            m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
+                            // REFACTORING PROBLEM!!!!
+                            //m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
                             m_log.DebugFormat(
                                 "[HGSceneCommService]: User {0} is going to another region, profile cache removed",
                                 avatar.UUID);