diff options
author | lbsa71 | 2009-03-20 06:49:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-03-20 06:49:12 +0000 |
commit | feaa64507183c6bedac790f5c3986cda191a5c3e (patch) | |
tree | 868e5cdc41ef39c3014cb8708064bb857bb37b28 /OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |
parent | Moving GetInventoryItem up to InventoryServiceBase, since this seems like a p... (diff) | |
download | opensim-SC-feaa64507183c6bedac790f5c3986cda191a5c3e.zip opensim-SC-feaa64507183c6bedac790f5c3986cda191a5c3e.tar.gz opensim-SC-feaa64507183c6bedac790f5c3986cda191a5c3e.tar.bz2 opensim-SC-feaa64507183c6bedac790f5c3986cda191a5c3e.tar.xz |
* De-duplicated login service some more
* Normalized m_inventoryService
* Pulled AddActiveGestures up
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer.Modules/UserLoginService.cs | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index f7ee8ef..f3287a7 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |||
@@ -53,8 +53,6 @@ namespace OpenSim.Grid.UserServer.Modules | |||
53 | { | 53 | { |
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | protected IInterServiceInventoryServices m_inventoryService; | ||
57 | |||
58 | public event UserLoggedInAtLocation OnUserLoggedInAtLocation; | 56 | public event UserLoggedInAtLocation OnUserLoggedInAtLocation; |
59 | 57 | ||
60 | private UserLoggedInAtLocation handlerUserLoggedInAtLocation; | 58 | private UserLoggedInAtLocation handlerUserLoggedInAtLocation; |
@@ -244,33 +242,6 @@ namespace OpenSim.Grid.UserServer.Modules | |||
244 | } | 242 | } |
245 | } | 243 | } |
246 | 244 | ||
247 | /// <summary> | ||
248 | /// Add active gestures of the user to the login response. | ||
249 | /// </summary> | ||
250 | /// <param name="response"> | ||
251 | /// A <see cref="LoginResponse"/> | ||
252 | /// </param> | ||
253 | /// <param name="theUser"> | ||
254 | /// A <see cref="UserProfileData"/> | ||
255 | /// </param> | ||
256 | protected override void AddActiveGestures(LoginResponse response, UserProfileData theUser) | ||
257 | { | ||
258 | List<InventoryItemBase> gestures = m_inventoryService.GetActiveGestures(theUser.ID); | ||
259 | //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count); | ||
260 | ArrayList list = new ArrayList(); | ||
261 | if (gestures != null) | ||
262 | { | ||
263 | foreach (InventoryItemBase gesture in gestures) | ||
264 | { | ||
265 | Hashtable item = new Hashtable(); | ||
266 | item["item_id"] = gesture.ID.ToString(); | ||
267 | item["asset_id"] = gesture.AssetID.ToString(); | ||
268 | list.Add(item); | ||
269 | } | ||
270 | } | ||
271 | response.ActiveGestures = list; | ||
272 | } | ||
273 | |||
274 | protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response) | 245 | protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response) |
275 | { | 246 | { |
276 | return PrepareLoginToRegion(RegionProfileData.FromRegionInfo(regionInfo), user, response); | 247 | return PrepareLoginToRegion(RegionProfileData.FromRegionInfo(regionInfo), user, response); |