diff options
author | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
commit | 4c90ee29432539efbf5942010dd574822235ed57 (patch) | |
tree | d159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.zip opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.gz opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2 opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 298ede9..a555eae 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -314,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
314 | } | 314 | } |
315 | ); | 315 | ); |
316 | } | 316 | } |
317 | } | 317 | } |
318 | 318 | ||
319 | private void RestoreSavedScriptState(UUID oldID, UUID newID) | 319 | private void RestoreSavedScriptState(UUID oldID, UUID newID) |
320 | { | 320 | { |
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
579 | m_items.TryGetValue(itemId, out item); | 579 | m_items.TryGetValue(itemId, out item); |
580 | 580 | ||
581 | return item; | 581 | return item; |
582 | } | 582 | } |
583 | 583 | ||
584 | /// <summary> | 584 | /// <summary> |
585 | /// Get inventory items by name. | 585 | /// Get inventory items by name. |
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
588 | /// <returns> | 588 | /// <returns> |
589 | /// A list of inventory items with that name. | 589 | /// A list of inventory items with that name. |
590 | /// If no inventory item has that name then an empty list is returned. | 590 | /// If no inventory item has that name then an empty list is returned. |
591 | /// </returns> | 591 | /// </returns> |
592 | public IList<TaskInventoryItem> GetInventoryItems(string name) | 592 | public IList<TaskInventoryItem> GetInventoryItems(string name) |
593 | { | 593 | { |
594 | IList<TaskInventoryItem> items = new List<TaskInventoryItem>(); | 594 | IList<TaskInventoryItem> items = new List<TaskInventoryItem>(); |