aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-10-07 02:48:28 +0100
committerMelanie2012-10-07 02:48:28 +0100
commitf7df68d922758c0a78664abe82d631579f6aa63f (patch)
tree85daa41ff4b35653b4fbb987cbc852ad853decef /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster (diff)
parentrefactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff)
downloadopensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.zip
opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz
opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2
opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
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 35df85c..30bf744 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1469,7 +1469,7 @@ namespace OpenSim.Region.Framework.Scenes
1469 return newFolderID; 1469 return newFolderID;
1470 } 1470 }
1471 1471
1472 private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) 1472 public void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems)
1473 { 1473 {
1474 if (folder == null) 1474 if (folder == null)
1475 return; 1475 return;