ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532

Browse Source
This commit is contained in:
Jeff Ames
2007-12-20 05:43:02 +00:00
parent 8d84156551
commit be2ad79e52
43 changed files with 270 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Grid/InventoryServer/GridInventoryService.cs
View File

@@ -108,7 +108,7 @@ namespace OpenSim.Grid.InventoryServer
{
LLUUID userID = new LLUUID(rawUserID);
MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToStringHyphenated());
MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToString());
InventoryCollection invCollection = new InventoryCollection();
List<InventoryFolderBase> folders;
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.InventoryServer
LLUUID userID = new LLUUID(rawUserID);
MainLog.Instance.Verbose(
"INVENTORY", "Creating new set of inventory folders for " + userID.ToStringHyphenated());
"INVENTORY", "Creating new set of inventory folders for " + userID.ToString());
CreateNewUserInventory(userID);
return true;
@@ -154,7 +154,7 @@ namespace OpenSim.Grid.InventoryServer
// Right now, this actions act more like an update/insert combination than a simple create.
MainLog.Instance.Verbose(
"INVENTORY",
"Updating in " + folder.parentID.ToStringHyphenated()
"Updating in " + folder.parentID.ToString()
+ ", folder " + folder.name);
AddNewInventoryFolder(folder.agentID, folder);
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.InventoryServer
MainLog.Instance.Verbose(
"INVENTORY",
"Moving folder " + folder.folderID
+ " to " + folder.parentID.ToStringHyphenated());
+ " to " + folder.parentID.ToString());
MoveExistingInventoryFolder(folder);
return true;
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.InventoryServer
// Right now, this actions act more like an update/insert combination than a simple create.
MainLog.Instance.Verbose(
"INVENTORY",
"Updating in " + item.parentFolderID.ToStringHyphenated()
"Updating in " + item.parentFolderID.ToString()
+ ", item " + item.inventoryName);
AddNewInventoryItem(item.avatarID, item);
@@ -189,7 +189,7 @@ namespace OpenSim.Grid.InventoryServer
// extra spaces to align with other inventory messages
MainLog.Instance.Verbose(
"INVENTORY",
"Deleting in " + item.parentFolderID.ToStringHyphenated()
"Deleting in " + item.parentFolderID.ToString()
+ ", item " + item.inventoryName);
DeleteItem(item);

4
OpenSim/Grid/InventoryServer/InventoryManager.cs
View File

@@ -164,13 +164,13 @@ namespace OpenSim.Grid.InventoryServer
private byte[] GetUserInventory(LLUUID userID)
{
MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToStringHyphenated());
MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToString());
byte[] result = new byte[] { };
InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID);
if (fb == null)
{
MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToStringHyphenated());
MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToString());
CreateDefaultInventory(userID);
}