diff options
| author | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
| commit | 89e79c11335d55ae8131d6fa92218bf387e6c48e (patch) | |
| tree | bb96e1093123b21e41f52e61000398f82f83f23b /OpenSim/Region/Framework/Interfaces | |
| parent | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy (diff) | |
| parent | Fix some symbol errors (diff) | |
| download | opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.zip opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.gz opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.bz2 opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionModule.cs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 2b90960..fd43923 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
| @@ -161,6 +161,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 161 | /// in this prim's inventory.</param> | 161 | /// in this prim's inventory.</param> |
| 162 | /// <returns>false if the item did not exist, true if the update occurred successfully</returns> | 162 | /// <returns>false if the item did not exist, true if the update occurred successfully</returns> |
| 163 | bool UpdateInventoryItem(TaskInventoryItem item); | 163 | bool UpdateInventoryItem(TaskInventoryItem item); |
| 164 | bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents); | ||
| 164 | 165 | ||
| 165 | /// <summary> | 166 | /// <summary> |
| 166 | /// Remove an item from this entity's inventory | 167 | /// Remove an item from this entity's inventory |
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs index 8365fe3..e25a6e8 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs | |||
| @@ -30,8 +30,8 @@ using OpenSim.Region.Framework.Scenes; | |||
| 30 | 30 | ||
| 31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
| 32 | { | 32 | { |
| 33 | /// <summary> | 33 | /// <summary> |
| 34 | /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead | 34 | /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead |
| 35 | /// </summary> | 35 | /// </summary> |
| 36 | public interface IRegionModule | 36 | public interface IRegionModule |
| 37 | { | 37 | { |