aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorlbsa712009-03-20 06:49:12 +0000
committerlbsa712009-03-20 06:49:12 +0000
commitfeaa64507183c6bedac790f5c3986cda191a5c3e (patch)
tree868e5cdc41ef39c3014cb8708064bb857bb37b28 /OpenSim/Client
parentMoving GetInventoryItem up to InventoryServiceBase, since this seems like a p... (diff)
downloadopensim-SC_OLD-feaa64507183c6bedac790f5c3986cda191a5c3e.zip
opensim-SC_OLD-feaa64507183c6bedac790f5c3986cda191a5c3e.tar.gz
opensim-SC_OLD-feaa64507183c6bedac790f5c3986cda191a5c3e.tar.bz2
opensim-SC_OLD-feaa64507183c6bedac790f5c3986cda191a5c3e.tar.xz
* De-duplicated login service some more
* Normalized m_inventoryService * Pulled AddActiveGestures up
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs40
1 files changed, 4 insertions, 36 deletions
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
52 protected bool m_authUsers = false; 52 protected bool m_authUsers = false;
53 53
54 /// <summary> 54 /// <summary>
55 /// Used by the login service to make requests to the inventory service.
56 /// </summary>
57 protected IInterServiceInventoryServices m_interServiceInventoryService;
58
59 /// <summary>
60 /// Used to make requests to the local regions. 55 /// Used to make requests to the local regions.
61 /// </summary> 56 /// </summary>
62 protected ILoginServiceToRegionsConnector m_regionsConnector; 57 protected ILoginServiceToRegionsConnector m_regionsConnector;
@@ -74,7 +69,7 @@ namespace OpenSim.Client.Linden
74 m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY; 69 m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY;
75 m_authUsers = authenticate; 70 m_authUsers = authenticate;
76 71
77 m_interServiceInventoryService = interServiceInventoryService; 72 m_inventoryService = interServiceInventoryService;
78 m_regionsConnector = regionsConnector; 73 m_regionsConnector = regionsConnector;
79 } 74 }
80 75
@@ -142,33 +137,6 @@ namespace OpenSim.Client.Linden
142 } 137 }
143 138
144 /// <summary> 139 /// <summary>
145 /// Add active gestures of the user to the login response.
146 /// </summary>
147 /// <param name="response">
148 /// A <see cref="LoginResponse"/>
149 /// </param>
150 /// <param name="theUser">
151 /// A <see cref="UserProfileData"/>
152 /// </param>
153 protected override void AddActiveGestures(LoginResponse response, UserProfileData theUser)
154 {
155 List<InventoryItemBase> gestures = m_interServiceInventoryService.GetActiveGestures(theUser.ID);
156 //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
157 ArrayList list = new ArrayList();
158 if (gestures != null)
159 {
160 foreach (InventoryItemBase gesture in gestures)
161 {
162 Hashtable item = new Hashtable();
163 item["item_id"] = gesture.ID.ToString();
164 item["asset_id"] = gesture.AssetID.ToString();
165 list.Add(item);
166 }
167 }
168 response.ActiveGestures = list;
169 }
170
171 /// <summary>
172 /// Prepare a login to the given region. This involves both telling the region to expect a connection 140 /// Prepare a login to the given region. This involves both telling the region to expect a connection
173 /// and appropriately customising the response to the user. 141 /// and appropriately customising the response to the user.
174 /// </summary> 142 /// </summary>
@@ -243,13 +211,13 @@ namespace OpenSim.Client.Linden
243 // See LoginService 211 // See LoginService
244 protected override InventoryData GetInventorySkeleton(UUID userID) 212 protected override InventoryData GetInventorySkeleton(UUID userID)
245 { 213 {
246 List<InventoryFolderBase> folders = m_interServiceInventoryService.GetInventorySkeleton(userID); 214 List<InventoryFolderBase> folders = m_inventoryService.GetInventorySkeleton(userID);
247 215
248 // If we have user auth but no inventory folders for some reason, create a new set of folders. 216 // If we have user auth but no inventory folders for some reason, create a new set of folders.
249 if (null == folders || 0 == folders.Count) 217 if (null == folders || 0 == folders.Count)
250 { 218 {
251 m_interServiceInventoryService.CreateNewUserInventory(userID); 219 m_inventoryService.CreateNewUserInventory(userID);
252 folders = m_interServiceInventoryService.GetInventorySkeleton(userID); 220 folders = m_inventoryService.GetInventorySkeleton(userID);
253 } 221 }
254 222
255 UUID rootID = UUID.Zero; 223 UUID rootID = UUID.Zero;