aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2007-12-01 19:57:23 +0000
committerMW2007-12-01 19:57:23 +0000
commit6c9e588acbf1ccbac133074f9d56e679ad95143e (patch)
tree997e06144bc55978270736fc62dd68c1eda73b5e /OpenSim/Grid
parentInitial working Grid Inventory server. Only been tested on a very small grid,... (diff)
downloadopensim-SC_OLD-6c9e588acbf1ccbac133074f9d56e679ad95143e.zip
opensim-SC_OLD-6c9e588acbf1ccbac133074f9d56e679ad95143e.tar.gz
opensim-SC_OLD-6c9e588acbf1ccbac133074f9d56e679ad95143e.tar.bz2
opensim-SC_OLD-6c9e588acbf1ccbac133074f9d56e679ad95143e.tar.xz
On login, if a set of inventory folders doesn't exist for the user then a new set is created in the inventory database. Most likely still better to use some other script to populate the inventory database instead of relaying on this.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs1
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs10
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index dda2f61..6983259 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Grid.InventoryServer
63 63
64 public bool CreateUsersInventory(LLUUID user) 64 public bool CreateUsersInventory(LLUUID user)
65 { 65 {
66 Console.WriteLine("Creating New Set of Inventory Folders for " + user.ToStringHyphenated());
66 CreateNewUserInventory(user); 67 CreateNewUserInventory(user);
67 return true; 68 return true;
68 } 69 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index d3164ad..1df4d9a 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -30,6 +30,7 @@ using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Net; 32using System.Net;
33using System.Threading;
33using Nwc.XmlRpc; 34using Nwc.XmlRpc;
34using libsecondlife; 35using libsecondlife;
35using OpenSim.Framework; 36using OpenSim.Framework;
@@ -197,7 +198,14 @@ namespace OpenSim.Grid.UserServer
197 protected override InventoryData CreateInventoryData(LLUUID userID) 198 protected override InventoryData CreateInventoryData(LLUUID userID)
198 { 199 {
199 List<InventoryFolderBase> folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID); 200 List<InventoryFolderBase> folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID);
200 if (folders.Count > 0) 201 if (folders ==null | folders.Count == 0)
202 {
203 RestObjectPoster.BeginPostObject<LLUUID>(m_config.InventoryUrl + "CreateInventory/", userID);
204 Thread.Sleep(1000);
205 folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID);
206 }
207
208 if(folders.Count >0)
201 { 209 {
202 LLUUID rootID = LLUUID.Zero; 210 LLUUID rootID = LLUUID.Zero;
203 ArrayList AgentInventoryArray = new ArrayList(); 211 ArrayList AgentInventoryArray = new ArrayList();