diff options
Initial working Grid Inventory server. Only been tested on a very small grid, so likely to have problems on a larger grid with more people?
To use , both the user server and Inventory server need to be running this latest revision. (older regions should be able to still be used, just the user won't have inventory on them). Also and HERE IS THE BIG BREAK ISSUE, currently, so that the initial inventory details for a user are added to the inventory db , you need to recreate the accounts using the user server "create user" feature. It should be quite easy to manual populate the inventory database instead but I someone else will need to look into that) Also I've only tested using SQLite as the database provider, there is a Mysql inventory provider but I don't know if it works (SQLite is set as default, so you will need to change it in the inventory server config.xml)
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/IInventoryServices.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index fc301c2..96bb7b3 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Communications | |||
39 | public interface IInventoryServices | 39 | public interface IInventoryServices |
40 | { | 40 | { |
41 | void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack); | 41 | void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack); |
42 | void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder); | 42 | void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder); |
43 | void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); | 43 | void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); |
44 | void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); | 44 | void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); |
45 | void CreateNewUserInventory(LLUUID user); | 45 | void CreateNewUserInventory(LLUUID user); |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index effe132..091d829 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications | |||
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | public void deleteItem(InventoryItemBase item) | 153 | public void DeleteItem(InventoryItemBase item) |
154 | { | 154 | { |
155 | foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) | 155 | foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) |
156 | { | 156 | { |
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Communications | |||
231 | public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, | 231 | public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
232 | InventoryItemInfo itemCallBack); | 232 | InventoryItemInfo itemCallBack); |
233 | 233 | ||
234 | public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder); | 234 | public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder); |
235 | public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); | 235 | public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); |
236 | public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); | 236 | public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); |
237 | } | 237 | } |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index f1f2c2b..119f8a5 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -366,7 +366,7 @@ namespace OpenSim.Framework.UserManagement | |||
366 | /// | 366 | /// |
367 | /// </summary> | 367 | /// </summary> |
368 | /// <param name="user"></param> | 368 | /// <param name="user"></param> |
369 | public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) | 369 | public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) |
370 | { | 370 | { |
371 | UserProfileData user = new UserProfileData(); | 371 | UserProfileData user = new UserProfileData(); |
372 | user.homeLocation = new LLVector3(128, 128, 100); | 372 | user.homeLocation = new LLVector3(128, 128, 100); |
@@ -391,6 +391,8 @@ namespace OpenSim.Framework.UserManagement | |||
391 | MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); | 391 | MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); |
392 | } | 392 | } |
393 | } | 393 | } |
394 | |||
395 | return user.UUID; | ||
394 | } | 396 | } |
395 | 397 | ||
396 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName); | 398 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName); |