diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 85a30448a8..7c3bed911a 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1546,7 +1546,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
uint regX = 1000;
uint regY = 1000;
string passwd = UUID.Random().ToString(); // No requirement to sign-in.
- CachedUserInfo UI;
UUID ID = UUID.Zero;
AvatarAppearance mava;
XmlNodeList avatars;
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
deleted file mode 100644
index 6648c36e14..0000000000
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ /dev/null
@@ -1,847 +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.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Framework.Communications.Cache
-{
- internal delegate void AddItemDelegate(InventoryItemBase itemInfo);
- internal delegate void UpdateItemDelegate(InventoryItemBase itemInfo);
- internal delegate void DeleteItemDelegate(UUID itemID);
- internal delegate void QueryItemDelegate(UUID itemID);
- internal delegate void QueryFolderDelegate(UUID folderID);
-
- internal delegate void CreateFolderDelegate(string folderName, UUID folderID, ushort folderType, UUID parentID);
- internal delegate void MoveFolderDelegate(UUID folderID, UUID parentID);
- internal delegate void PurgeFolderDelegate(UUID folderID);
- internal delegate void UpdateFolderDelegate(string name, UUID folderID, ushort type, UUID parentID);
-
- internal delegate void SendInventoryDescendentsDelegate(
- IClientAPI client, UUID folderID, bool fetchFolders, bool fetchItems);
-
- public delegate void OnItemReceivedDelegate(UUID itemID);
- public delegate void OnInventoryReceivedDelegate(UUID userID);
-
- ///
- /// Stores user profile and inventory data received from backend services for a particular user.
- ///
- public class CachedUserInfo
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- ////
- /// Fired when a particular item has been received from the inventory service
- ///
- public event OnItemReceivedDelegate OnItemReceived;
-
- ///
- /// Fired once the entire inventory has been received for the user
- ///
- public event OnInventoryReceivedDelegate OnInventoryReceived;
-
- ///
- /// The comms manager holds references to services (user, grid, inventory, etc.)
- ///
- private readonly IInventoryService m_InventoryService;
-
- public UserProfileData UserProfile { get { return m_userProfile; } }
- private UserProfileData m_userProfile;
-
- ///
- /// Have we received the user's inventory from the inventory service?
- ///
- public bool HasReceivedInventory { get { return m_hasReceivedInventory; } }
- private bool m_hasReceivedInventory;
-
- ///
- /// Inventory requests waiting for receipt of this user's inventory from the inventory service.
- ///
- private readonly IList m_pendingRequests = new List();
-
- ///
- /// The root folder of this user's inventory. Returns null if the root folder has not yet been received.
- ///
- public InventoryFolderImpl RootFolder { get { return m_rootFolder; } }
- private InventoryFolderImpl m_rootFolder;
-
- public UUID SessionID
- {
- get { return m_session_id; }
- set { m_session_id = value; }
- }
- private UUID m_session_id = UUID.Zero;
-
- ///
- /// Constructor
- ///
- ///
- ///
- public CachedUserInfo(IInventoryService invService, UserProfileData userProfile)
- {
- m_userProfile = userProfile;
- m_InventoryService = invService;
- }
-
- ///
- /// This allows a request to be added to be processed once we receive a user's inventory
- /// from the inventory service. If we already have the inventory, the request
- /// is executed immediately instead.
- ///
- ///
- protected void AddRequest(IInventoryRequest request)
- {
- lock (m_pendingRequests)
- {
- if (HasReceivedInventory)
- {
- request.Execute();
- }
- else
- {
- m_pendingRequests.Add(request);
- }
- }
- }
-
- ///
- /// Helper function for InventoryReceive() - Store a folder temporarily until we've received entire folder list
- ///
- ///
- private void AddFolderToDictionary(InventoryFolderImpl folder, IDictionary> dictionary)
- {
- UUID parentFolderId = folder.ParentID;
-
- if (dictionary.ContainsKey(parentFolderId))
- {
- dictionary[parentFolderId].Add(folder);
- }
- else
- {
- IList folders = new List();
- folders.Add(folder);
- dictionary[parentFolderId] = folders;
- }
- }
-
- ///
- /// Recursively, in depth-first order, add all the folders we've received (stored
- /// in a dictionary indexed by parent ID) into the tree that describes user folder
- /// heirarchy
- /// Any folder that is resolved into the tree is also added to resolvedFolderDictionary,
- /// indexed by folder ID.
- ///
- ///
- /// A
- ///
- private void ResolveReceivedFolders(InventoryFolderImpl parentFolder,
- IDictionary> receivedFolderDictionary,
- IDictionary resolvedFolderDictionary)
- {
- if (receivedFolderDictionary.ContainsKey(parentFolder.ID))
- {
- List resolvedFolders = new List(); // Folders we've resolved with this invocation
- foreach (InventoryFolderImpl folder in receivedFolderDictionary[parentFolder.ID])
- {
- if (parentFolder.ContainsChildFolder(folder.ID))
- {
- m_log.WarnFormat(
- "[INVENTORY CACHE]: Received folder {0} {1} from inventory service which has already been received",
- folder.Name, folder.ID);
- }
- else
- {
- if (resolvedFolderDictionary.ContainsKey(folder.ID))
- {
- m_log.WarnFormat(
- "[INVENTORY CACHE]: Received folder {0} {1} from inventory service has already been received but with different parent",
- folder.Name, folder.ID);
- }
- else
- {
- resolvedFolders.Add(folder);
- resolvedFolderDictionary[folder.ID] = folder;
- parentFolder.AddChildFolder(folder);
- }
- }
- } // foreach (folder in pendingCategorizationFolders[parentFolder.ID])
-
- receivedFolderDictionary.Remove(parentFolder.ID);
- foreach (InventoryFolderImpl folder in resolvedFolders)
- ResolveReceivedFolders(folder, receivedFolderDictionary, resolvedFolderDictionary);
- } // if (receivedFolderDictionary.ContainsKey(parentFolder.ID))
- }
-
- ///
- /// Drop all cached inventory.
- ///
- public void DropInventory()
- {
- m_log.Debug("[INVENTORY CACHE]: DropInventory called");
- // Make sure there aren't pending requests around when we do this
- // FIXME: There is still a race condition where an inventory operation can be requested (since these aren't being locked).
- // Will have to extend locking to exclude this very soon.
- lock (m_pendingRequests)
- {
- m_hasReceivedInventory = false;
- m_rootFolder = null;
- }
- }
-
- ///
- /// Fetch inventory for this user.
- ///
- /// This has to be executed as a separate step once user information is retreived.
- /// This will occur synchronously if the inventory service is in the same process as this class, and
- /// asynchronously otherwise.
- public void FetchInventory()
- {
- m_InventoryService.GetUserInventory(UserProfile.ID, InventoryReceive);
- }
-
- ///
- /// Callback invoked when the inventory is received from an async request to the inventory service
- ///
- ///
- ///
- public void InventoryReceive(ICollection folders, ICollection items)
- {
- // FIXME: Exceptions thrown upwards never appear on the console. Could fix further up if these
- // are simply being swallowed
-
- try
- {
- // collection of all received folders, indexed by their parent ID
- IDictionary> receivedFolders =
- new Dictionary>();
-
- // collection of all folders that have been placed into the folder heirarchy starting at m_rootFolder
- // This dictonary exists so we don't have to do an InventoryFolderImpl.FindFolder(), which is O(n) on the
- // number of folders in our inventory.
- // Maybe we should make this structure a member so we can skip InventoryFolderImpl.FindFolder() calls later too?
- IDictionary resolvedFolders =
- new Dictionary();
-
- // Take all received folders, find the root folder, and put ther rest into
- // the pendingCategorizationFolders collection
- foreach (InventoryFolderImpl folder in folders)
- AddFolderToDictionary(folder, receivedFolders);
-
- if (!receivedFolders.ContainsKey(UUID.Zero))
- throw new Exception("Database did not return a root inventory folder");
- else
- {
- IList rootFolderList = receivedFolders[UUID.Zero];
- m_rootFolder = rootFolderList[0];
- resolvedFolders[m_rootFolder.ID] = m_rootFolder;
- if (rootFolderList.Count > 1)
- {
- for (int i = 1; i < rootFolderList.Count; i++)
- {
- m_log.WarnFormat(
- "[INVENTORY CACHE]: Discarding extra root folder {0}. Using previously received root folder {1}",
- rootFolderList[i].ID, RootFolder.ID);
- }
- }
- receivedFolders.Remove(UUID.Zero);
- }
-
- // Now take the pendingCategorizationFolders collection, and turn that into a tree,
- // with the root being RootFolder
- if (RootFolder != null)
- ResolveReceivedFolders(RootFolder, receivedFolders, resolvedFolders);
-
- // Generate a warning for folders that are not part of the heirarchy
- foreach (KeyValuePair> folderList in receivedFolders)
- {
- foreach (InventoryFolderImpl folder in folderList.Value)
- m_log.WarnFormat("[INVENTORY CACHE]: Malformed Database: Unresolved Pending Folder {0}", folder.Name);
- }
-
- // Take all ther received items and put them into the folder tree heirarchy
- foreach (InventoryItemBase item in items) {
- InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null;
- ItemReceive(item, folder);
- }
- }
- catch (Exception e)
- {
- m_log.ErrorFormat("[INVENTORY CACHE]: Error processing inventory received from inventory service, {0}", e);
- }
-
- // Deal with pending requests
- lock (m_pendingRequests)
- {
- // We're going to change inventory status within the lock to avoid a race condition
- // where requests are processed after the AddRequest() method has been called.
- m_hasReceivedInventory = true;
-
- foreach (IInventoryRequest request in m_pendingRequests)
- {
- request.Execute();
- }
- }
-
- if (OnInventoryReceived != null)
- OnInventoryReceived(UserProfile.ID);
- }
-
- ///
- /// Callback invoked when an item is received from an async request to the inventory service.
- ///
- /// We're assuming here that items are always received after all the folders
- /// received.
- /// If folder is null, we will search for it starting from RootFolder (an O(n) operation),
- /// otherwise we'll just put it into folder
- ///
- ///
- private void ItemReceive(InventoryItemBase itemInfo, InventoryFolderImpl folder)
- {
- // m_log.DebugFormat(
- // "[INVENTORY CACHE]: Received item {0} {1} for user {2}",
- // itemInfo.Name, itemInfo.ID, userID);
-
- if (folder == null && RootFolder != null)
- folder = RootFolder.FindFolder(itemInfo.Folder);
-
- if (null == folder)
- {
- m_log.WarnFormat(
- "Received item {0} {1} but its folder {2} does not exist",
- itemInfo.Name, itemInfo.ID, itemInfo.Folder);
-
- return;
- }
-
- lock (folder.Items)
- {
- folder.Items[itemInfo.ID] = itemInfo;
- }
-
- if (OnItemReceived != null)
- OnItemReceived(itemInfo.ID);
- }
-
- ///
- /// Create a folder in this agent's inventory.
- ///
- ///
- /// If the inventory service has not yet delievered the inventory
- /// for this user then the request will be queued.
- ///
- ///
- ///
- public bool CreateFolder(string folderName, UUID folderID, ushort folderType, UUID parentID)
- {
- // m_log.DebugFormat(
- // "[AGENT INVENTORY]: Creating inventory folder {0} {1} for {2} {3}", folderID, folderName, remoteClient.Name, remoteClient.AgentId);
-
- if (m_hasReceivedInventory)
- {
- InventoryFolderImpl parentFolder = RootFolder.FindFolder(parentID);
-
- if (null == parentFolder)
- {
- m_log.WarnFormat(
- "[AGENT INVENTORY]: Tried to create folder {0} {1} but the parent {2} does not exist",
- folderName, folderID, parentID);
-
- return false;
- }
-
- InventoryFolderImpl createdFolder = parentFolder.CreateChildFolder(folderID, folderName, folderType);
-
- if (createdFolder != null)
- {
- InventoryFolderBase createdBaseFolder = new InventoryFolderBase();
- createdBaseFolder.Owner = createdFolder.Owner;
- createdBaseFolder.ID = createdFolder.ID;
- createdBaseFolder.Name = createdFolder.Name;
- createdBaseFolder.ParentID = createdFolder.ParentID;
- createdBaseFolder.Type = createdFolder.Type;
- createdBaseFolder.Version = createdFolder.Version;
-
- m_InventoryService.AddFolder(createdBaseFolder);
-
- return true;
- }
- else
- {
- m_log.WarnFormat(
- "[AGENT INVENTORY]: Tried to create folder {0} {1} but the folder already exists",
- folderName, folderID);
-
- return false;
- }
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(CreateFolderDelegate), this, "CreateFolder"),
- new object[] { folderName, folderID, folderType, parentID }));
-
- return true;
- }
- }
-
- ///
- /// Handle a client request to update the inventory folder
- ///
- ///
- /// If the inventory service has not yet delievered the inventory
- /// for this user then the request will be queued.
- ///
- /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
- /// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing,
- /// and needs to be changed.
- ///
- ///
- ///
- ///
- ///
- public bool UpdateFolder(string name, UUID folderID, ushort type, UUID parentID)
- {
- // m_log.DebugFormat(
- // "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId);
-
- if (m_hasReceivedInventory)
- {
- InventoryFolderImpl folder = RootFolder.FindFolder(folderID);
-
- // Delegate movement if updated parent id isn't the same as the existing parentId
- if (folder.ParentID != parentID)
- MoveFolder(folderID, parentID);
-
- InventoryFolderBase baseFolder = new InventoryFolderBase();
- baseFolder.Owner = m_userProfile.ID;
- baseFolder.ID = folderID;
- baseFolder.Name = name;
- baseFolder.ParentID = parentID;
- baseFolder.Type = (short)type;
- baseFolder.Version = RootFolder.Version;
-
- m_InventoryService.UpdateFolder(baseFolder);
-
- folder.Name = name;
- folder.Type = (short)type;
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(UpdateFolderDelegate), this, "UpdateFolder"),
- new object[] { name, folderID, type, parentID }));
- }
-
- return true;
- }
-
- ///
- /// Handle an inventory folder move request from the client.
- ///
- /// If the inventory service has not yet delievered the inventory
- /// for this user then the request will be queued.
- ///
- ///
- ///
- ///
- ///
- /// true if the delete was successful, or if it was queued pending folder receipt
- /// false if the folder to be deleted did not exist.
- ///
- public bool MoveFolder(UUID folderID, UUID parentID)
- {
- // m_log.DebugFormat(
- // "[AGENT INVENTORY]: Moving inventory folder {0} into folder {1} for {2} {3}",
- // parentID, remoteClient.Name, remoteClient.Name, remoteClient.AgentId);
-
- if (m_hasReceivedInventory)
- {
- InventoryFolderBase baseFolder = new InventoryFolderBase();
- baseFolder.Owner = m_userProfile.ID;
- baseFolder.ID = folderID;
- baseFolder.ParentID = parentID;
-
- m_InventoryService.MoveFolder(baseFolder);
-
- InventoryFolderImpl folder = RootFolder.FindFolder(folderID);
- InventoryFolderImpl parentFolder = RootFolder.FindFolder(parentID);
- if (parentFolder != null && folder != null)
- {
- InventoryFolderImpl oldParentFolder = RootFolder.FindFolder(folder.ParentID);
-
- if (oldParentFolder != null)
- {
- oldParentFolder.RemoveChildFolder(folderID);
- parentFolder.AddChildFolder(folder);
- }
- else
- {
- return false;
- }
- }
- else
- {
- return false;
- }
-
- return true;
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(MoveFolderDelegate), this, "MoveFolder"),
- new object[] { folderID, parentID }));
-
- return true;
- }
- }
-
- ///
- /// This method will delete all the items and folders in the given folder.
- ///
- /// If the inventory service has not yet delievered the inventory
- /// for this user then the request will be queued.
- ///
- ///
- public bool PurgeFolder(UUID folderID)
- {
- // m_log.InfoFormat("[AGENT INVENTORY]: Purging folder {0} for {1} uuid {2}",
- // folderID, remoteClient.Name, remoteClient.AgentId);
-
- if (m_hasReceivedInventory)
- {
- InventoryFolderImpl purgedFolder = RootFolder.FindFolder(folderID);
-
- if (purgedFolder != null)
- {
- // XXX Nasty - have to create a new object to hold details we already have
- InventoryFolderBase purgedBaseFolder = new InventoryFolderBase();
- purgedBaseFolder.Owner = purgedFolder.Owner;
- purgedBaseFolder.ID = purgedFolder.ID;
- purgedBaseFolder.Name = purgedFolder.Name;
- purgedBaseFolder.ParentID = purgedFolder.ParentID;
- purgedBaseFolder.Type = purgedFolder.Type;
- purgedBaseFolder.Version = purgedFolder.Version;
-
- m_InventoryService.PurgeFolder(purgedBaseFolder);
-
- purgedFolder.Purge();
-
- return true;
- }
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(PurgeFolderDelegate), this, "PurgeFolder"),
- new object[] { folderID }));
-
- return true;
- }
-
- return false;
- }
-
- ///
- /// Add an item to the user's inventory.
- ///
- /// If the item has no folder set (i.e. it is UUID.Zero), then it is placed in the most appropriate folder
- /// for that type.
- ///
- public void AddItem(InventoryItemBase item)
- {
- if (m_hasReceivedInventory)
- {
- if (item.Folder == UUID.Zero)
- {
- InventoryFolderImpl f = FindFolderForType(item.AssetType);
- if (f != null)
- item.Folder = f.ID;
- else
- item.Folder = RootFolder.ID;
- }
- ItemReceive(item, null);
-
- m_InventoryService.AddItem(item);
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(AddItemDelegate), this, "AddItem"),
- new object[] { item }));
- }
- }
-
- ///
- /// Update an item in the user's inventory
- ///
- ///
- ///
- public void UpdateItem(InventoryItemBase item)
- {
- if (m_hasReceivedInventory)
- {
- m_InventoryService.UpdateItem(item);
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(UpdateItemDelegate), this, "UpdateItem"),
- new object[] { item }));
- }
- }
-
- ///
- /// Delete an item from the user's inventory
- ///
- /// If the inventory service has not yet delievered the inventory
- /// for this user then the request will be queued.
- ///
- ///
- ///
- /// true on a successful delete or a if the request is queued.
- /// Returns false on an immediate failure
- ///
- public bool DeleteItem(UUID itemID)
- {
- if (m_hasReceivedInventory)
- {
- // XXX For historical reasons (grid comms), we need to retrieve the whole item in order to delete, even though
- // really only the item id is required.
- InventoryItemBase item = RootFolder.FindItem(itemID);
-
- if (null == item)
- {
- m_log.WarnFormat("[AGENT INVENTORY]: Tried to delete item {0} which does not exist", itemID);
-
- return false;
- }
-
- if (RootFolder.DeleteItem(item.ID))
- {
- List uuids = new List();
- uuids.Add(itemID);
- return m_InventoryService.DeleteItems(this.UserProfile.ID, uuids);
- }
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(DeleteItemDelegate), this, "DeleteItem"),
- new object[] { itemID }));
-
- return true;
- }
-
- return false;
- }
-
- ///
- /// Send details of the inventory items and/or folders in a given folder to the client.
- ///
- ///
- ///
- ///
- ///
- /// true if the request was queued or successfully processed, false otherwise
- public bool SendInventoryDecendents(IClientAPI client, UUID folderID, int version, bool fetchFolders, bool fetchItems)
- {
- if (m_hasReceivedInventory)
- {
- InventoryFolderImpl folder;
-
- if ((folder = RootFolder.FindFolder(folderID)) != null)
- {
- // m_log.DebugFormat(
- // "[AGENT INVENTORY]: Found folder {0} for client {1}",
- // folderID, remoteClient.AgentId);
-
- client.SendInventoryFolderDetails(
- client.AgentId, folderID, folder.RequestListOfItems(),
- folder.RequestListOfFolders(), version, fetchFolders, fetchItems);
-
- return true;
- }
- else
- {
- m_log.WarnFormat(
- "[AGENT INVENTORY]: Could not find folder {0} requested by user {1} {2}",
- folderID, client.Name, client.AgentId);
-
- return false;
- }
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(SendInventoryDescendentsDelegate), this, "SendInventoryDecendents", false, false),
- new object[] { client, folderID, fetchFolders, fetchItems }));
-
- return true;
- }
- }
-
- ///
- /// Find an appropriate folder for the given asset type
- ///
- ///
- /// null if no appropriate folder exists
- public InventoryFolderImpl FindFolderForType(int type)
- {
- if (RootFolder == null)
- return null;
-
- return RootFolder.FindFolderForType(type);
- }
-
- // Load additional items that other regions have put into the database
- // The item will be added tot he local cache. Returns true if the item
- // was found and can be sent to the client
- //
- public bool QueryItem(InventoryItemBase item)
- {
- if (m_hasReceivedInventory)
- {
- InventoryItemBase invItem = RootFolder.FindItem(item.ID);
-
- if (invItem != null)
- {
- // Item is in local cache, just update client
- //
- return true;
- }
-
- InventoryItemBase itemInfo = null;
-
- itemInfo = m_InventoryService.GetItem(item);
-
- if (itemInfo != null)
- {
- InventoryFolderImpl folder = RootFolder.FindFolder(itemInfo.Folder);
- ItemReceive(itemInfo, folder);
- return true;
- }
-
- return false;
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(QueryItemDelegate), this, "QueryItem"),
- new object[] { item.ID }));
-
- return true;
- }
- }
-
- public bool QueryFolder(InventoryFolderBase folder)
- {
- if (m_hasReceivedInventory)
- {
- InventoryFolderBase invFolder = RootFolder.FindFolder(folder.ID);
-
- if (invFolder != null)
- {
- // Folder is in local cache, just update client
- //
- return true;
- }
-
- InventoryFolderBase folderInfo = null;
-
- folderInfo = m_InventoryService.GetFolder(folder);
-
- if (folderInfo != null)
- {
- InventoryFolderImpl createdFolder = RootFolder.CreateChildFolder(folderInfo.ID, folderInfo.Name, (ushort)folderInfo.Type);
-
- createdFolder.Version = folderInfo.Version;
- createdFolder.Owner = folderInfo.Owner;
- createdFolder.ParentID = folderInfo.ParentID;
-
- return true;
- }
-
- return false;
- }
- else
- {
- AddRequest(
- new InventoryRequest(
- Delegate.CreateDelegate(typeof(QueryFolderDelegate), this, "QueryFolder"),
- new object[] { folder.ID }));
-
- return true;
- }
- }
- }
-
- ///
- /// Should be implemented by callers which require a callback when the user's inventory is received
- ///
- public interface IInventoryRequest
- {
- ///
- /// This is the method executed once we have received the user's inventory by which the request can be fulfilled.
- ///
- void Execute();
- }
-
- ///
- /// Generic inventory request
- ///
- class InventoryRequest : IInventoryRequest
- {
- private Delegate m_delegate;
- private Object[] m_args;
-
- internal InventoryRequest(Delegate delegat, Object[] args)
- {
- m_delegate = delegat;
- m_args = args;
- }
-
- public void Execute()
- {
- if (m_delegate != null)
- m_delegate.DynamicInvoke(m_args);
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
deleted file mode 100644
index acae4b12fa..0000000000
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ /dev/null
@@ -1,277 +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.Collections.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Framework.Communications.Cache
-{
- ///
- /// Holds user profile information and retrieves it from backend services.
- ///
- public class UserProfileCacheService
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- ///
- /// Standard format for names.
- ///
- public const string NAME_FORMAT = "{0} {1}";
-
- ///
- /// The comms manager holds references to services (user, grid, inventory, etc.)
- ///
- private readonly CommunicationsManager m_commsManager;
-
- ///
- /// User profiles indexed by UUID
- ///
- private readonly Dictionary m_userProfilesById
- = new Dictionary();
-
- ///
- /// User profiles indexed by name
- ///
- private readonly Dictionary m_userProfilesByName
- = new Dictionary();
-
- ///
- /// The root library folder.
- ///
- public readonly InventoryFolderImpl LibraryRoot;
-
- private IInventoryService m_InventoryService;
-
- ///
- /// Constructor
- ///
- ///
- ///
- public UserProfileCacheService(CommunicationsManager commsManager, LibraryRootFolder libraryRootFolder)
- {
- m_commsManager = commsManager;
- LibraryRoot = libraryRootFolder;
- }
-
- public void SetInventoryService(IInventoryService invService)
- {
- m_InventoryService = invService;
- }
-
- ///
- /// A new user has moved into a region in this instance so retrieve their profile from the user service.
- ///
- ///
- /// It isn't strictly necessary to make this call since user data can be lazily requested later on. However,
- /// it might be helpful in order to avoid an initial response delay later on
- ///
- ///
- public void AddNewUser(UUID userID)
- {
- if (userID == UUID.Zero)
- return;
-
- //m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
- GetUserDetails(userID);
- }
-
- ///
- /// Remove this user's profile cache.
- ///
- ///
- /// true if the user was successfully removed, false otherwise
- public bool RemoveUser(UUID userId)
- {
- if (!RemoveFromCaches(userId))
- {
- m_log.WarnFormat(
- "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId);
-
- return false;
- }
-
- return true;
- }
-
- ///
- /// Get details of the given user.
- ///
- /// If the user isn't in cache then the user is requested from the profile service.
- ///
- /// null if no user details are found
- public CachedUserInfo GetUserDetails(string fname, string lname)
- {
- lock (m_userProfilesByName)
- {
- CachedUserInfo userInfo;
-
- if (m_userProfilesByName.TryGetValue(string.Format(NAME_FORMAT, fname, lname), out userInfo))
- {
- return userInfo;
- }
- else
- {
- UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(fname, lname);
-
- if (userProfile != null)
- {
-
- if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
- userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
- if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
- userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
-
- return AddToCaches(userProfile);
- }
- else
- return null;
- }
- }
- }
-
- ///
- /// Get details of the given user.
- ///
- /// If the user isn't in cache then the user is requested from the profile service.
- ///
- /// null if no user details are found
- public CachedUserInfo GetUserDetails(UUID userID)
- {
- if (userID == UUID.Zero)
- return null;
-
- lock (m_userProfilesById)
- {
- if (m_userProfilesById.ContainsKey(userID))
- {
- return m_userProfilesById[userID];
- }
- else
- {
- UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(userID);
- if (userProfile != null)
- {
-
- if ((userProfile.UserAssetURI == null || userProfile.UserAssetURI == "") && m_commsManager.NetworkServersInfo != null)
- userProfile.UserAssetURI = m_commsManager.NetworkServersInfo.AssetURL;
- if ((userProfile.UserInventoryURI == null || userProfile.UserInventoryURI == "") && m_commsManager.NetworkServersInfo != null)
- userProfile.UserInventoryURI = m_commsManager.NetworkServersInfo.InventoryURL;
-
- return AddToCaches(userProfile);
- }
- else
- return null;
- }
- }
- }
-
- ///
- /// Update an existing profile
- ///
- ///
- /// true if a user profile was found to update, false otherwise
- // Commented out for now. The implementation needs to be improved by protecting against race conditions,
- // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
- // returning a read only class from the cache).
-// public bool StoreProfile(UserProfileData userProfile)
-// {
-// lock (m_userProfilesById)
-// {
-// CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
-//
-// if (userInfo != null)
-// {
-// userInfo.m_userProfile = userProfile;
-// m_commsManager.UserService.UpdateUserProfile(userProfile);
-//
-// return true;
-// }
-// }
-//
-// return false;
-// }
-
- ///
- /// Populate caches with the given user profile
- ///
- ///
- protected CachedUserInfo AddToCaches(UserProfileData userProfile)
- {
- CachedUserInfo createdUserInfo = new CachedUserInfo(m_InventoryService, userProfile);
-
- lock (m_userProfilesById)
- {
- m_userProfilesById[createdUserInfo.UserProfile.ID] = createdUserInfo;
-
- lock (m_userProfilesByName)
- {
- m_userProfilesByName[createdUserInfo.UserProfile.Name] = createdUserInfo;
- }
- }
-
- return createdUserInfo;
- }
-
- ///
- /// Remove profile belong to the given uuid from the caches
- ///
- ///
- /// true if there was a profile to remove, false otherwise
- protected bool RemoveFromCaches(UUID userId)
- {
- lock (m_userProfilesById)
- {
- if (m_userProfilesById.ContainsKey(userId))
- {
- CachedUserInfo userInfo = m_userProfilesById[userId];
- m_userProfilesById.Remove(userId);
-
- lock (m_userProfilesByName)
- {
- m_userProfilesByName.Remove(userInfo.UserProfile.Name);
- }
-
- return true;
- }
- }
-
- return false;
- }
-
- ///
- /// Preloads User data into the region cache. Modules may use this service to add non-standard clients
- ///
- ///
- public void PreloadUserCache(UserProfileData userData)
- {
- AddToCaches(userData);
- }
- }
-}
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index d215340c0c..4dff71fdb9 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -53,12 +53,6 @@ namespace OpenSim.Framework.Communications
}
protected IUserService m_userService;
- public UserProfileCacheService UserProfileCacheService
- {
- get { return m_userProfileCacheService; }
- }
- protected UserProfileCacheService m_userProfileCacheService;
-
public IAvatarService AvatarService
{
get { return m_avatarService; }
@@ -94,39 +88,8 @@ namespace OpenSim.Framework.Communications
LibraryRootFolder libraryRootFolder)
{
m_networkServersInfo = serversInfo;
- m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
}
-
-
- ///
- /// Logs off a user and does the appropriate communications
- ///
- ///
- ///
- ///
- ///
- ///
- public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
- {
- m_userService.LogOffUser(userid, regionid, regionhandle, position, lookat);
- }
-
- ///
- /// Logs off a user and does the appropriate communications (deprecated as of 2008-08-27)
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
- {
- m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
- }
-
-
#region Packet Handlers
public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index de106b2850..a8ffa176a8 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Serialization.External
public const int MAJOR_VERSION = 0;
public const int MINOR_VERSION = 1;
- public static string Serialize(UserAccount profile)
+ public static string Serialize(UUID userID, string firstName, string lastName)
{
StringWriter sw = new StringWriter();
XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Serialization.External
xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString());
xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString());
- xtw.WriteElementString("name", profile.FirstName + " " + profile.LastName);
- xtw.WriteElementString("id", profile.PrincipalID.ToString());
+ xtw.WriteElementString("name", firstName + " " + lastName);
+ xtw.WriteElementString("id", userID.ToString());
xtw.WriteElementString("about", "");
// Not sure if we're storing this yet, need to take a look
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
deleted file mode 100644
index 77caf4726e..0000000000
--- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
+++ /dev/null
@@ -1,225 +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;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Services;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-
-namespace OpenSim.Grid.UserServer.Modules
-{
-
- ///
- /// Hypergrid login service used in grid mode.
- ///
- public class UserLoginAuthService : HGLoginAuthService
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- public UserConfig m_config;
- private readonly IRegionProfileRouter m_regionProfileService;
-
- protected BaseHttpServer m_httpServer;
-
- public UserLoginAuthService(
- UserManagerBase userManager, IInterServiceInventoryServices inventoryService,
- LibraryRootFolder libraryRootFolder,
- UserConfig config, string welcomeMess, IRegionProfileRouter regionProfileService)
- : base(userManager, welcomeMess, inventoryService, null, true, libraryRootFolder, null)
- {
- m_config = config;
- m_defaultHomeX = m_config.DefaultX;
- m_defaultHomeY = m_config.DefaultY;
- m_interInventoryService = inventoryService;
- m_regionProfileService = regionProfileService;
-
- NetworkServersInfo serversinfo = new NetworkServersInfo(1000, 1000);
- serversinfo.GridRecvKey = m_config.GridRecvKey;
- serversinfo.GridSendKey = m_config.GridSendKey;
- serversinfo.GridURL = m_config.GridServerURL.ToString();
- serversinfo.InventoryURL = m_config.InventoryUrl.ToString();
- serversinfo.UserURL = m_config.AuthUrl.ToString();
- SetServersInfo(serversinfo);
- }
-
- public void RegisterHandlers(BaseHttpServer httpServer)
- {
- m_httpServer = httpServer;
-
- httpServer.AddXmlRPCHandler("hg_login", XmlRpcLoginMethod);
- httpServer.AddXmlRPCHandler("hg_new_auth_key", XmlRpcGenerateKeyMethod);
- httpServer.AddXmlRPCHandler("hg_verify_auth_key", XmlRpcVerifyKeyMethod);
- }
-
-
- public override void LogOffUser(UserProfileData theUser, string message)
- {
- RegionProfileData SimInfo;
- try
- {
- SimInfo = m_regionProfileService.RequestSimProfileData(
- theUser.CurrentAgent.Handle, m_config.GridServerURL,
- m_config.GridSendKey, m_config.GridRecvKey);
-
- if (SimInfo == null)
- {
- m_log.Error("[GRID]: Region user was in isn't currently logged in");
- return;
- }
- }
- catch (Exception)
- {
- m_log.Error("[GRID]: Unable to look up region to log user off");
- return;
- }
-
- // Prepare notification
- Hashtable SimParams = new Hashtable();
- SimParams["agent_id"] = theUser.ID.ToString();
- SimParams["region_secret"] = theUser.CurrentAgent.SecureSessionID.ToString();
- SimParams["region_secret2"] = SimInfo.regionSecret;
- //m_log.Info(SimInfo.regionSecret);
- SimParams["regionhandle"] = theUser.CurrentAgent.Handle.ToString();
- SimParams["message"] = message;
- ArrayList SendParams = new ArrayList();
- SendParams.Add(SimParams);
-
- m_log.InfoFormat(
- "[ASSUMED CRASH]: Telling region {0} @ {1},{2} ({3}) that their agent is dead: {4}",
- SimInfo.regionName, SimInfo.regionLocX, SimInfo.regionLocY, SimInfo.httpServerURI,
- theUser.FirstName + " " + theUser.SurName);
-
- try
- {
- XmlRpcRequest GridReq = new XmlRpcRequest("logoff_user", SendParams);
- XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
-
- if (GridResp.IsFault)
- {
- m_log.ErrorFormat(
- "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}, This is likely an old region revision.",
- SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
- }
- }
- catch (Exception)
- {
- m_log.Error("[LOGIN]: Error telling region to logout user!");
- }
-
- // Prepare notification
- SimParams = new Hashtable();
- SimParams["agent_id"] = theUser.ID.ToString();
- SimParams["region_secret"] = SimInfo.regionSecret;
- //m_log.Info(SimInfo.regionSecret);
- SimParams["regionhandle"] = theUser.CurrentAgent.Handle.ToString();
- SimParams["message"] = message;
- SendParams = new ArrayList();
- SendParams.Add(SimParams);
-
- m_log.InfoFormat(
- "[ASSUMED CRASH]: Telling region {0} @ {1},{2} ({3}) that their agent is dead: {4}",
- SimInfo.regionName, SimInfo.regionLocX, SimInfo.regionLocY, SimInfo.httpServerURI,
- theUser.FirstName + " " + theUser.SurName);
-
- try
- {
- XmlRpcRequest GridReq = new XmlRpcRequest("logoff_user", SendParams);
- XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
-
- if (GridResp.IsFault)
- {
- m_log.ErrorFormat(
- "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}, This is likely an old region revision.",
- SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
- }
- }
- catch (Exception)
- {
- m_log.Error("[LOGIN]: Error telling region to logout user!");
- }
- //base.LogOffUser(theUser);
- }
-
- protected override RegionInfo RequestClosestRegion(string region)
- {
- RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(region,
- m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
-
- if (profileData != null)
- {
- return profileData.ToRegionInfo();
- }
- else
- {
- return null;
- }
- }
-
- protected override RegionInfo GetRegionInfo(ulong homeRegionHandle)
- {
- RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionHandle,
- m_config.GridServerURL, m_config.GridSendKey,
- m_config.GridRecvKey);
- if (profileData != null)
- {
- return profileData.ToRegionInfo();
- }
- else
- {
- return null;
- }
- }
-
- protected override RegionInfo GetRegionInfo(UUID homeRegionId)
- {
- RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionId,
- m_config.GridServerURL, m_config.GridSendKey,
- m_config.GridRecvKey);
- if (profileData != null)
- {
- return profileData.ToRegionInfo();
- }
- else
- {
- return null;
- }
- }
-
- }
-}
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 286076d7dc..5bf728a1f3 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -64,7 +64,6 @@ namespace OpenSim.Grid.UserServer
protected UserServerFriendsModule m_friendsModule;
public UserLoginService m_loginService;
- public UserLoginAuthService m_loginAuthService;
public MessageServersConnector m_messagesService;
protected GridInfoServiceModule m_gridInfoService;
@@ -245,9 +244,6 @@ namespace OpenSim.Grid.UserServer
m_loginService = new UserLoginService(
m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy());
- if (Cfg.EnableHGLogin)
- m_loginAuthService = new UserLoginAuthService(m_userDataBaseService, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile),
- Cfg, Cfg.DefaultStartupMsg, new RegionProfileServiceProxy());
}
protected virtual void PostInitialiseModules()
@@ -266,9 +262,6 @@ namespace OpenSim.Grid.UserServer
{
m_loginService.RegisterHandlers(m_httpServer, Cfg.EnableLLSDLogin, true);
- if (m_loginAuthService != null)
- m_loginAuthService.RegisterHandlers(m_httpServer);
-
m_userManager.RegisterHandlers(m_httpServer);
m_friendsModule.RegisterHandlers(m_httpServer);
m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index ab5dafd623..0d9d75816d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
m_archiveWriter.WriteFile(
ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml",
- UserProfileSerializer.Serialize(creator));
+ UserProfileSerializer.Serialize(creator.PrincipalID, creator.FirstName, creator.LastName));
}
else
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 3c1f7b6fa8..f3ccbda649 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -763,26 +763,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return (userData.UserServerURI == LocalUserServerURI);
}
- // Is the user going back to the home region or the home grid?
- protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
- {
- if (uinfo == null)
- return false;
+ // REFACTORING PROBLEM
+ //// Is the user going back to the home region or the home grid?
+ //protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
+ //{
+ // if (uinfo == null)
+ // return false;
- if (uinfo.UserProfile == null)
- return false;
+ // if (uinfo.UserProfile == null)
+ // return false;
- if (!(uinfo.UserProfile is ForeignUserProfileData))
- // it's a home user, can't be outside to return home
- return false;
+ // if (!(uinfo.UserProfile is ForeignUserProfileData))
+ // // it's a home user, can't be outside to return home
+ // return false;
- // OK, it's a foreign user with a ForeignUserProfileData
- // and is going back to exactly the home region.
- // We can't check if it's going back to a non-home region
- // of the home grid. That will be dealt with in the
- // receiving end
- return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID);
- }
+ // // OK, it's a foreign user with a ForeignUserProfileData
+ // // and is going back to exactly the home region.
+ // // We can't check if it's going back to a non-home region
+ // // of the home grid. That will be dealt with in the
+ // // receiving end
+ // return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID);
+ //}
protected bool IsLocalUser(UserAccount account)
{
diff --git a/prebuild.xml b/prebuild.xml
index 5fde5b0e8c..6568bae337 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -193,7 +193,6 @@
-