aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs19
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs40
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs33
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs29
4 files changed, 36 insertions, 85 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 4fc3094..3bf87b3 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -241,25 +241,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
241 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 241 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
242 } 242 }
243 243
244 //private LocalLoginService CreateLoginService(LibraryRootFolder libraryRootFolder, IInterServiceInventoryServices inventoryService, LocalUserServices userService, LocalBackEndServices backendService)
245 //{
246 // LocalLoginService loginService =
247 // new LocalLoginService(
248 // userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo,
249 // m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder);
250
251 // // set up XMLRPC handler for client's initial login request message
252 // m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
253
254 // // provides the web form login
255 // m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
256
257 // // Provides the LLSD login
258 // m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
259
260 // return loginService;
261 //}
262
263 private void CreateGridInfoService() 244 private void CreateGridInfoService()
264 { 245 {
265 // provide grid info 246 // provide grid info
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;
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 92bf83f..b84f5b6 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -60,6 +60,11 @@ namespace OpenSim.Framework.Communications
60 protected uint m_defaultHomeY; 60 protected uint m_defaultHomeY;
61 61
62 /// <summary> 62 /// <summary>
63 /// Used by the login service to make requests to the inventory service.
64 /// </summary>
65 protected IInterServiceInventoryServices m_inventoryService;
66
67 /// <summary>
63 /// Constructor 68 /// Constructor
64 /// </summary> 69 /// </summary>
65 /// <param name="userManager"></param> 70 /// <param name="userManager"></param>
@@ -1008,7 +1013,33 @@ namespace OpenSim.Framework.Communications
1008 protected abstract RegionInfo RequestClosestRegion(string region); 1013 protected abstract RegionInfo RequestClosestRegion(string region);
1009 protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle); 1014 protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle);
1010 protected abstract RegionInfo GetRegionInfo(UUID homeRegionId); 1015 protected abstract RegionInfo GetRegionInfo(UUID homeRegionId);
1011 protected abstract void AddActiveGestures(LoginResponse response, UserProfileData theUser);
1012 protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response); 1016 protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response);
1017
1018 /// <summary>
1019 /// Add active gestures of the user to the login response.
1020 /// </summary>
1021 /// <param name="response">
1022 /// A <see cref="LoginResponse"/>
1023 /// </param>
1024 /// <param name="theUser">
1025 /// A <see cref="UserProfileData"/>
1026 /// </param>
1027 protected void AddActiveGestures(LoginResponse response, UserProfileData theUser)
1028 {
1029 List<InventoryItemBase> gestures = m_inventoryService.GetActiveGestures(theUser.ID);
1030 //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
1031 ArrayList list = new ArrayList();
1032 if (gestures != null)
1033 {
1034 foreach (InventoryItemBase gesture in gestures)
1035 {
1036 Hashtable item = new Hashtable();
1037 item["item_id"] = gesture.ID.ToString();
1038 item["asset_id"] = gesture.AssetID.ToString();
1039 list.Add(item);
1040 }
1041 }
1042 response.ActiveGestures = list;
1043 }
1013 } 1044 }
1014} 1045}
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);