diff options
| author | Dan Lake | 2012-10-08 15:25:26 -0700 |
|---|---|---|
| committer | Dan Lake | 2012-10-08 15:25:26 -0700 |
| commit | d342adaa8760ee7ada1b87dec1c8c415c9e77f73 (patch) | |
| tree | a914c203322b761640450c7be06c54984b64494d /OpenSim/Region/Framework | |
| parent | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ... (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.zip opensim-SC-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.gz opensim-SC-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.bz2 opensim-SC-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 3b59dc4..b23ddb4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1424,7 +1424,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1424 | return newFolderID; | 1424 | return newFolderID; |
| 1425 | } | 1425 | } |
| 1426 | 1426 | ||
| 1427 | private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) | 1427 | public void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) |
| 1428 | { | 1428 | { |
| 1429 | if (folder == null) | 1429 | if (folder == null) |
| 1430 | return; | 1430 | return; |