aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs7
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 8b42e2e..60e00a2 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -602,6 +602,13 @@ namespace OpenSim
602 } 602 }
603 603
604 break; 604 break;
605
606 case "Add-InventoryHost":
607 if (cmdparams.Length > 0)
608 {
609 m_commsManager.AddInventoryService(cmdparams[0]);
610 }
611 break;
605 default: 612 default:
606 string[] tmpPluginArgs = new string[cmdparams.Length + 1]; 613 string[] tmpPluginArgs = new string[cmdparams.Length + 1];
607 cmdparams.CopyTo(tmpPluginArgs, 1); 614 cmdparams.CopyTo(tmpPluginArgs, 1);
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5f4558d..30a639a 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.Communications.Local
258 } 258 }
259 259
260 // See LoginService 260 // See LoginService
261 protected override InventoryData GetInventorySkeleton(LLUUID userID) 261 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
262 { 262 {
263 List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); 263 List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
264 264