ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

More EntityTransferContext plumbing

Browse Source
This commit is contained in:
Melanie Thielker
2015-11-01 19:37:14 +01:00
parent 69585a4824
commit 5f18f2ce6a
10 changed files with 32 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
View File

@@ -152,7 +152,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
// <param name=""></param>
public bool SetAppearance(UUID userID, AvatarAppearance appearance)
{
OSDMap map = appearance.Pack(-1);
EntityTransferContext ctx = new EntityTransferContext();
OSDMap map = appearance.Pack(ctx);
if (map == null)
{
m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR]: Failed to encode appearance for {0}",userID);

6
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.Simulation
try
{
OSDMap args = aCircuit.PackAgentCircuitData(-1);
OSDMap args = aCircuit.PackAgentCircuitData(ctx);
PackData(args, source, aCircuit, destination, flags);
OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
@@ -260,7 +260,7 @@ namespace OpenSim.Services.Connectors.Simulation
try
{
OSDMap args = cAgentData.Pack();
OSDMap args = cAgentData.Pack(ctx);
args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
@@ -347,8 +347,6 @@ namespace OpenSim.Services.Connectors.Simulation
ctx.OutboundVersion = float.Parse(parts[1]);
}
}
if (data.ContainsKey("variable_wearables_count_supported"))
ctx.VariableWearablesSupported = true;
m_log.DebugFormat(
"[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}",

14
OpenSim/Services/Interfaces/ISimulationService.cs
View File

@@ -34,20 +34,6 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
namespace OpenSim.Services.Interfaces
{
public class EntityTransferContext
{
public EntityTransferContext()
{
InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
VariableWearablesSupported = false;
}
public float InboundVersion { get; set; }
public float OutboundVersion { get; set; }
public bool VariableWearablesSupported { get; set; }
}
public interface ISimulationService
{
/// <summary>