From feaa64507183c6bedac790f5c3986cda191a5c3e Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 20 Mar 2009 06:49:12 +0000
Subject: * De-duplicated login service some more * Normalized
m_inventoryService * Pulled AddActiveGestures up
---
OpenSim/Client/Linden/LLStandaloneLoginService.cs | 40 +++--------------------
1 file changed, 4 insertions(+), 36 deletions(-)
(limited to 'OpenSim/Client/Linden/LLStandaloneLoginService.cs')
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index b596e14..cf63103 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -52,11 +52,6 @@ namespace OpenSim.Client.Linden
protected bool m_authUsers = false;
///
- /// Used by the login service to make requests to the inventory service.
- ///
- protected IInterServiceInventoryServices m_interServiceInventoryService;
-
- ///
/// Used to make requests to the local regions.
///
protected ILoginServiceToRegionsConnector m_regionsConnector;
@@ -74,7 +69,7 @@ namespace OpenSim.Client.Linden
m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY;
m_authUsers = authenticate;
- m_interServiceInventoryService = interServiceInventoryService;
+ m_inventoryService = interServiceInventoryService;
m_regionsConnector = regionsConnector;
}
@@ -142,33 +137,6 @@ namespace OpenSim.Client.Linden
}
///
- /// Add active gestures of the user to the login response.
- ///
- ///
- /// A
- ///
- ///
- /// A
- ///
- protected override void AddActiveGestures(LoginResponse response, UserProfileData theUser)
- {
- List gestures = m_interServiceInventoryService.GetActiveGestures(theUser.ID);
- //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
- ArrayList list = new ArrayList();
- if (gestures != null)
- {
- foreach (InventoryItemBase gesture in gestures)
- {
- Hashtable item = new Hashtable();
- item["item_id"] = gesture.ID.ToString();
- item["asset_id"] = gesture.AssetID.ToString();
- list.Add(item);
- }
- }
- response.ActiveGestures = list;
- }
-
- ///
/// Prepare a login to the given region. This involves both telling the region to expect a connection
/// and appropriately customising the response to the user.
///
@@ -243,13 +211,13 @@ namespace OpenSim.Client.Linden
// See LoginService
protected override InventoryData GetInventorySkeleton(UUID userID)
{
- List folders = m_interServiceInventoryService.GetInventorySkeleton(userID);
+ List folders = m_inventoryService.GetInventorySkeleton(userID);
// If we have user auth but no inventory folders for some reason, create a new set of folders.
if (null == folders || 0 == folders.Count)
{
- m_interServiceInventoryService.CreateNewUserInventory(userID);
- folders = m_interServiceInventoryService.GetInventorySkeleton(userID);
+ m_inventoryService.CreateNewUserInventory(userID);
+ folders = m_inventoryService.GetInventorySkeleton(userID);
}
UUID rootID = UUID.Zero;
--
cgit v1.1