From 69585a4824a7814bbe543d624de6c3627e0b927b Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 1 Nov 2015 19:11:14 +0100
Subject: More plumbing of the EntityTransferContext (not yet complete)
---
OpenSim/Services/Interfaces/IAvatarService.cs | 3 ++-
OpenSim/Services/Interfaces/ISimulationService.cs | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Services/Interfaces')
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index bd66dad..99b71b9 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -150,7 +150,8 @@ namespace OpenSim.Services.Interfaces
// Wearables
Data["AvatarHeight"] = appearance.AvatarHeight.ToString();
- for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++)
+ // TODO: With COF, is this even needed?
+ for (int i = 0 ; i < AvatarWearable.LEGACY_VERSION_MAX_WEARABLES ; i++)
{
for (int j = 0 ; j < appearance.Wearables[i].Count ; j++)
{
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 3f6b009..4496a9f 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Interfaces
///
///
/// Reason message in the event of a failure.
- bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason);
+ bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason);
///
/// Full child agent update.
@@ -82,7 +82,7 @@ namespace OpenSim.Services.Interfaces
///
///
///
- bool UpdateAgent(GridRegion destination, AgentData data);
+ bool UpdateAgent(GridRegion destination, AgentData data, EntityTransferContext ctx);
///
/// Short child agent update, mostly for position.
--
cgit v1.1