diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 76bcd7e..098e010 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 105 | public void ForceInventoryPersistence() | 105 | public void ForceInventoryPersistence() |
| 106 | { | 106 | { |
| 107 | HasInventoryChanged = true; | 107 | HasInventoryChanged = true; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | /// <summary> | 110 | /// <summary> |
| 111 | /// Reset UUIDs for all the items in the prim's inventory. This involves either generating | 111 | /// Reset UUIDs for all the items in the prim's inventory. This involves either generating |
| @@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 164 | /// <summary> | 164 | /// <summary> |
| 165 | /// Change every item in this inventory to a new group. | 165 | /// Change every item in this inventory to a new group. |
| 166 | /// </summary> | 166 | /// </summary> |
| 167 | /// <param name="groupID"></param> | 167 | /// <param name="groupID"></param> |
| 168 | public void ChangeInventoryGroup(UUID groupID) | 168 | public void ChangeInventoryGroup(UUID groupID) |
| 169 | { | 169 | { |
| 170 | lock (Items) | 170 | lock (Items) |