aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
authorMelanie2010-07-31 00:57:50 +0100
committerMelanie2010-07-31 00:57:50 +0100
commit3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116 (patch)
tree87bbf9ba4bf4e4e3b31e00d276dda98f1ecd156e /OpenSim/Services/Connectors/SimianGrid
parentBannination fixes. Objects in nonpublic parcels were muted by default. Gods (diff)
parentSlight improvement on previous commit. (diff)
downloadopensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.zip
opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.gz
opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.bz2
opensim-SC-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index dc68259..2b6d29c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -745,6 +745,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
745 } 745 }
746 } 746 }
747 747
748 m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invFolders.Count + " folders from SimianGrid response");
748 return invFolders; 749 return invFolders;
749 } 750 }
750 751
@@ -810,6 +811,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
810 } 811 }
811 } 812 }
812 813
814 m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invItems.Count + " items from SimianGrid response");
813 return invItems; 815 return invItems;
814 } 816 }
815 817