aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Linden
diff options
context:
space:
mode:
authorlbsa712009-03-20 17:25:12 +0000
committerlbsa712009-03-20 17:25:12 +0000
commit613201e22045166d5a22f7bc1ef75ebe6639b1de (patch)
tree63ffa8749297b61318d78b6911d5ef21d8d60351 /OpenSim/Client/Linden
parentEnsure the remembered velocity is zero when physical is turned off on a prim.... (diff)
downloadopensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.zip
opensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.tar.gz
opensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.tar.bz2
opensim-SC_OLD-613201e22045166d5a22f7bc1ef75ebe6639b1de.tar.xz
* Normalized and pulled GetInventorySkeleton up.
Diffstat (limited to 'OpenSim/Client/Linden')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs34
1 files changed, 0 insertions, 34 deletions
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
index cf63103..2c97eee 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs
@@ -201,46 +201,12 @@ namespace OpenSim.Client.Linden
201 201
202 if (m_regionsConnector.RegionLoginsEnabled) 202 if (m_regionsConnector.RegionLoginsEnabled)
203 { 203 {
204 // m_log.Info("[LLStandaloneLoginModule] Informing region about user");
205 return m_regionsConnector.NewUserConnection(regionInfo.RegionHandle, agent); 204 return m_regionsConnector.NewUserConnection(regionInfo.RegionHandle, agent);
206 } 205 }
207 206
208 return false; 207 return false;
209 } 208 }
210 209
211 // See LoginService
212 protected override InventoryData GetInventorySkeleton(UUID userID)
213 {
214 List<InventoryFolderBase> folders = m_inventoryService.GetInventorySkeleton(userID);
215
216 // If we have user auth but no inventory folders for some reason, create a new set of folders.
217 if (null == folders || 0 == folders.Count)
218 {
219 m_inventoryService.CreateNewUserInventory(userID);
220 folders = m_inventoryService.GetInventorySkeleton(userID);
221 }
222
223 UUID rootID = UUID.Zero;
224 ArrayList AgentInventoryArray = new ArrayList();
225 Hashtable TempHash;
226 foreach (InventoryFolderBase InvFolder in folders)
227 {
228 if (InvFolder.ParentID == UUID.Zero)
229 {
230 rootID = InvFolder.ID;
231 }
232 TempHash = new Hashtable();
233 TempHash["name"] = InvFolder.Name;
234 TempHash["parent_id"] = InvFolder.ParentID.ToString();
235 TempHash["version"] = (Int32)InvFolder.Version;
236 TempHash["type_default"] = (Int32)InvFolder.Type;
237 TempHash["folder_id"] = InvFolder.ID.ToString();
238 AgentInventoryArray.Add(TempHash);
239 }
240
241 return new InventoryData(AgentInventoryArray, rootID);
242 }
243
244 public override void LogOffUser(UserProfileData theUser, string message) 210 public override void LogOffUser(UserProfileData theUser, string message)
245 { 211 {
246 RegionInfo SimInfo; 212 RegionInfo SimInfo;