Merge fixes, and fix the build

This commit is contained in:
Tom
2011-09-14 18:46:42 -07:00
parent 03f6734f43
commit cda4cd6b55
10 changed files with 184 additions and 354 deletions

View File

@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces
IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
// Same as above, but also load script states from a separate doc
UUID RezSingleAttachmentFromInventory(
ISceneEntity RezSingleAttachmentFromInventory(
IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc);
/// <summary>