From 549dc5aeb9e693f1f575896796d19b03ec3a732f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 28 Apr 2011 08:58:04 -0700
Subject: Eliminated sAgentCircuitData, a data structure that has been obsolete
for quite some time.
---
OpenSim/Framework/AgentCircuitData.cs | 69 ----------------------
OpenSim/Framework/ClientInfo.cs | 2 +-
.../Region/ClientStack/LindenUDP/LLClientView.cs | 2 +-
3 files changed, 2 insertions(+), 71 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 3dbc215..dbd47d3 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -152,27 +152,6 @@ namespace OpenSim.Framework
}
/// <summary>
- /// Create AgentCircuitData from a Serializable AgentCircuitData
- /// </summary>
- /// <param name="cAgent"></param>
- public AgentCircuitData(sAgentCircuitData cAgent)
- {
- AgentID = new UUID(cAgent.AgentID);
- SessionID = new UUID(cAgent.SessionID);
- SecureSessionID = new UUID(cAgent.SecureSessionID);
- startpos = new Vector3(cAgent.startposx, cAgent.startposy, cAgent.startposz);
- firstname = cAgent.firstname;
- lastname = cAgent.lastname;
- circuitcode = cAgent.circuitcode;
- child = cAgent.child;
- InventoryFolder = new UUID(cAgent.InventoryFolder);
- BaseFolder = new UUID(cAgent.BaseFolder);
- CapsPath = cAgent.CapsPath;
- ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
- Viewer = cAgent.Viewer;
- }
-
- /// <summary>
/// Pack AgentCircuitData into an OSDMap for transmission over LLSD XML or LLSD json
/// </summary>
/// <returns>map of the agent circuit data</returns>
@@ -369,52 +348,4 @@ namespace OpenSim.Framework
}
- /// <summary>
- /// Serializable Agent Circuit Data
- /// </summary>
- [Serializable]
- public class sAgentCircuitData
- {
- public Guid AgentID;
- public Guid BaseFolder;
- public string CapsPath = String.Empty;
- public Dictionary<ulong, string> ChildrenCapSeeds;
- public bool child;
- public uint circuitcode;
- public string firstname;
- public Guid InventoryFolder;
- public string lastname;
- public Guid SecureSessionID;
- public Guid SessionID;
- public float startposx;
- public float startposy;
- public float startposz;
- public string Viewer;
- public string Channel;
- public string Mac;
- public string Id0;
-
- public sAgentCircuitData()
- {
- }
-
- public sAgentCircuitData(AgentCircuitData cAgent)
- {
- AgentID = cAgent.AgentID.Guid;
- SessionID = cAgent.SessionID.Guid;
- SecureSessionID = cAgent.SecureSessionID.Guid;
- startposx = cAgent.startpos.X;
- startposy = cAgent.startpos.Y;
- startposz = cAgent.startpos.Z;
- firstname = cAgent.firstname;
- lastname = cAgent.lastname;
- circuitcode = cAgent.circuitcode;
- child = cAgent.child;
- InventoryFolder = cAgent.InventoryFolder.Guid;
- BaseFolder = cAgent.BaseFolder.Guid;
- CapsPath = cAgent.CapsPath;
- ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
- Viewer = cAgent.Viewer;
- }
- }
}
diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs
index fbd18b5..8292c6a 100644
--- a/OpenSim/Framework/ClientInfo.cs
+++ b/OpenSim/Framework/ClientInfo.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
[Serializable]
public class ClientInfo
{
- public sAgentCircuitData agentcircuit;
+ public AgentCircuitData agentcircuit;
public Dictionary<uint, byte[]> needAck;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 22bad99..43903ce 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11635,7 +11635,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
info.userEP = m_userEndPoint;
info.proxyEP = null;
- info.agentcircuit = new sAgentCircuitData(RequestClientInfo());
+ info.agentcircuit = RequestClientInfo();
return info;
}
--
cgit v1.1