Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-06 00:27:10 +01:00
38 changed files with 90 additions and 30167 deletions

View File

@@ -2800,7 +2800,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID = UUID.Random();
LinkNum = linkNum;
LocalId = 0;
Inventory.ResetInventoryIDs();
Inventory.ResetInventoryIDs();
}
/// <summary>