ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.9-post-fixes' into careminster

Browse Source
This commit is contained in:
Melanie
2010-03-06 12:24:09 +00:00
parent 62dd83f473 83929c69e3
commit 1f7a0cf892
81 changed files with 2899 additions and 6279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@@ -318,8 +318,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
static System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
private void RestoreSavedScriptState(UUID oldID, UUID newID)
{
IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
@@ -585,7 +583,7 @@ namespace OpenSim.Region.Framework.Scenes
m_items.TryGetValue(itemId, out item);
m_items.LockItemsForRead(false);
return item;
}
}
/// <summary>
/// Get inventory items by name.
@@ -594,7 +592,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns>
/// A list of inventory items with that name.
/// If no inventory item has that name then an empty list is returned.
/// </returns>
/// </returns>
public IList<TaskInventoryItem> GetInventoryItems(string name)
{
IList<TaskInventoryItem> items = new List<TaskInventoryItem>();