5 files changed, 18 insertions, 324 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index aa71536..6648c36 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -679,7 +679,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// <param name="fetchFolders"></param>
         /// <param name="fetchItems"></param>
         /// <returns>true if the request was queued or successfully processed, false otherwise</returns>
-        public bool SendInventoryDecendents(IClientAPI client, UUID folderID, bool fetchFolders, bool fetchItems)
+        public bool SendInventoryDecendents(IClientAPI client, UUID folderID, int version, bool fetchFolders, bool fetchItems)
         {
             if (m_hasReceivedInventory)
             {
@@ -693,7 +693,7 @@ namespace OpenSim.Framework.Communications.Cache
 
                     client.SendInventoryFolderDetails(
                         client.AgentId, folderID, folder.RequestListOfItems(),
-                        folder.RequestListOfFolders(), fetchFolders, fetchItems);
+                        folder.RequestListOfFolders(), version, fetchFolders, fetchItems);
 
                     return true;
                 }
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index 32f0efc..4013896 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Framework.Communications.Osp
             if (!ospa.StartsWith(OSPA_PREFIX))
                 return UUID.Zero;
 
-            m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
+//            m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
             
             string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
             string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 922cd49..b652299 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1031,30 +1031,26 @@ namespace OpenSim.Framework.Communications.Services
                 return true;
             }
 
-            // StartLocation not available, send him to a nearby region instead
-            // regionInfo = m_gridService.RequestClosestRegion("");
-            //m_log.InfoFormat("[LOGIN]: StartLocation not available sending to region {0}", regionInfo.regionName);
+            // Get the default region handle
+            ulong defaultHandle = Utils.UIntsToLong(m_defaultHomeX * Constants.RegionSize, m_defaultHomeY * Constants.RegionSize);
 
-            // Send him to default region instead
-            ulong defaultHandle = (((ulong)m_defaultHomeX * Constants.RegionSize) << 32) |
-                                  ((ulong)m_defaultHomeY * Constants.RegionSize);
+            // If we haven't already tried the default region, reset regionInfo
+            if (regionInfo != null && defaultHandle != regionInfo.RegionHandle)
+                regionInfo = null;
 
-            if ((regionInfo != null) && (defaultHandle == regionInfo.RegionHandle))
+            if (regionInfo == null)
             {
-                m_log.ErrorFormat("[LOGIN]: Not trying the default region since this is the same as the selected region");
-                return false;
+                m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead");
+                regionInfo = GetRegionInfo(defaultHandle);
             }
 
-            m_log.Error("[LOGIN]: Sending user to default region " + defaultHandle + " instead");
-            regionInfo = GetRegionInfo(defaultHandle);
-
             if (regionInfo == null)
             {
-                m_log.ErrorFormat("[LOGIN]: No default region available. Aborting.");
-                return false;
+                m_log.ErrorFormat("[LOGIN]: Sending user to any region");
+                regionInfo = RequestClosestRegion(String.Empty);
             }
 
-            theUser.CurrentAgent.Position = new Vector3(128, 128, 0);
+            theUser.CurrentAgent.Position = new Vector3(128f, 128f, 0f);
             response.StartLocation = "safe";
 
             return PrepareLoginToRegion(regionInfo, theUser, response, client);
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
deleted file mode 100644
index caaebd7..0000000
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ /dev/null
@@ -1,159 +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 System;
-using System.Collections.Generic;
-using System.Threading;
-using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Services.Interfaces;
-using OpenSim.Tests.Common.Mock;
-
-namespace OpenSim.Framework.Communications.Tests
-{
-    /// <summary>
-    /// Asset cache tests
-    /// </summary>
-    [TestFixture] 
-    public class AssetCacheTests
-    {
-        private class FakeUserService : IUserService
-        {
-            public void AddTemporaryUserProfile(UserProfileData userProfile)
-            {
-                throw new NotImplementedException();
-            }
-            
-            public UserProfileData GetUserProfile(string firstName, string lastName)
-            {
-                throw new NotImplementedException();
-            }
-
-            public UserProfileData GetUserProfile(UUID userId)
-            {
-                throw new NotImplementedException();
-            }
-
-            public UserProfileData GetUserProfile(Uri uri)
-            {
-                UserProfileData userProfile = new UserProfileData();
-
-//                userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret));
-
-                return userProfile;
-            }
-
-            public Uri GetUserUri(UserProfileData userProfile)
-            {
-                throw new NotImplementedException();
-            }
-
-            public UserAgentData GetAgentByUUID(UUID userId)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearUserAgent(UUID avatarID)
-            {
-                throw new NotImplementedException();
-            }
-
-            public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID QueryID, string Query)
-            {
-                throw new NotImplementedException();
-            }
-
-            public UserProfileData SetupMasterUser(string firstName, string lastName)
-            {
-                throw new NotImplementedException();
-            }
-
-            public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
-            {
-                throw new NotImplementedException();
-            }
-
-            public UserProfileData SetupMasterUser(UUID userId)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool UpdateUserProfile(UserProfileData data)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
-            {
-                throw new NotImplementedException();
-            }
-
-            public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool VerifySession(UUID userID, UUID sessionID)
-            {
-                return true;
-            }
-
-            public void SetInventoryService(IInventoryService inv)
-            {
-                throw new NotImplementedException();
-            }
-
-            public virtual bool AuthenticateUserByPassword(UUID userID, string password)
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index e891d9c..60f0ba8 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Communications.Tests
 
             m_regionConnector.AddRegion(new RegionInfo(42, 43, m_capsEndPoint, m_regionExternalName));
 
-            //IInventoryService m_inventoryService = new TestInventoryService();
+            //IInventoryService m_inventoryService = new MockInventoryService();
 
             m_localUserServices = (LocalUserServices) m_commsManager.UserService;
             m_localUserServices.AddUser(m_firstName,m_lastName,"boingboing","abc@ftw.com",42,43);
@@ -95,7 +95,8 @@ namespace OpenSim.Framework.Communications.Tests
             TestHelper.InMethod();
             // We want to use our own LoginService for this test, one that
             // doesn't require authentication.
-            new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(),
+            new LLStandaloneLoginService(
+                (UserManagerBase)m_commsManager.UserService, "Hello folks", new MockInventoryService(),
                 m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector);
 
             Hashtable loginParams = new Hashtable();
@@ -457,148 +458,4 @@ namespace OpenSim.Framework.Communications.Tests
             #endregion
         }
     }
-
-    class TestInventoryService : IInventoryService
-    {
-        public TestInventoryService()
-        {
-        }
-
-        /// <summary>
-        /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public bool CreateUserInventory(UUID userId)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
-        {
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            InventoryFolderBase folder = new InventoryFolderBase();
-            folder.ID = UUID.Random();
-            folder.Owner = userId;
-            folders.Add(folder);
-            return folders;
-        }
-
-        /// <summary>
-        /// Returns a list of all the active gestures in a user's inventory.
-        /// </summary>
-        /// <param name="userId">
-        /// The <see cref="UUID"/> of the user
-        /// </param>
-        /// <returns>
-        /// A flat list of the gesture items.
-        /// </returns>
-        public List<InventoryItemBase> GetActiveGestures(UUID userId)
-        {
-            return null;
-        }
-
-        public InventoryCollection GetUserInventory(UUID userID)
-        {
-            return null;
-        }
-
-        public void GetUserInventory(UUID userID, OpenSim.Services.Interfaces.InventoryReceiptCallback callback)
-        {
-        }
-
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        {
-            return null;
-        }
-
-        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
-        {
-            return null;
-        }
-
-        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
-        {
-            return null;
-        }
-
-        public bool AddFolder(InventoryFolderBase folder)
-        {
-            return false;
-        }
-
-        public bool UpdateFolder(InventoryFolderBase folder)
-        {
-            return false;
-        }
-
-        public bool MoveFolder(InventoryFolderBase folder)
-        {
-            return false;
-        }
-
-        public bool DeleteFolders(UUID ownerID, List<UUID> ids)
-        {
-            return false;
-        }
-
-        public bool PurgeFolder(InventoryFolderBase folder)
-        {
-            return false;
-        }
-
-        public bool AddItem(InventoryItemBase item)
-        {
-            return false;
-        }
-
-        public bool UpdateItem(InventoryItemBase item)
-        {
-            return false;
-        }
-
-        public bool MoveItems(UUID owner, List<InventoryItemBase> items)
-        {
-            return false;
-        }
-
-        public bool DeleteItems(UUID owner, List<UUID> items)
-        {
-            return false;
-        }
-
-        public InventoryItemBase GetItem(InventoryItemBase item)
-        {
-            return null;
-        }
-
-        public InventoryFolderBase GetFolder(InventoryFolderBase folder)
-        {
-            return null;
-        }
-
-        public bool HasInventoryForUser(UUID userID)
-        {
-            return false;
-        }
-
-        public InventoryFolderBase GetRootFolder(UUID userID)
-        {
-            InventoryFolderBase root = new InventoryFolderBase();
-            root.ID = UUID.Random();
-            root.Owner = userID;
-            root.ParentID = UUID.Zero;
-            return root;
-        }
-
-        public int GetAssetPermissions(UUID userID, UUID assetID)
-        {
-            return 1;
-        }
-    }
-}
+}
\ No newline at end of file