diff options
Very Preliminary local teleporting added (currently only can teleport within the current region).
Now need to add teleporting between regions and use of the dynamic texture for the terrain.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.cs | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index 29c871e..74dbc1a 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim | |||
95 | cirpack = initialcirpack; | 95 | cirpack = initialcirpack; |
96 | userEP = remoteEP; | 96 | userEP = remoteEP; |
97 | 97 | ||
98 | this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code); | 98 | //this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code); |
99 | this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); | 99 | this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code); |
100 | 100 | ||
101 | PacketQueue = new BlockingQueue<QueItem>(); | 101 | PacketQueue = new BlockingQueue<QueItem>(); |
@@ -113,27 +113,6 @@ namespace OpenSim | |||
113 | } | 113 | } |
114 | 114 | ||
115 | # region Client Methods | 115 | # region Client Methods |
116 | public void UpgradeClient() | ||
117 | { | ||
118 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent"); | ||
119 | this.m_child = false; | ||
120 | //this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode); | ||
121 | m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false); | ||
122 | if (OnChildAgentStatus != null) | ||
123 | { | ||
124 | OnChildAgentStatus(this.m_child); | ||
125 | } | ||
126 | } | ||
127 | |||
128 | public void DowngradeClient() | ||
129 | { | ||
130 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child"); | ||
131 | this.m_child = true; | ||
132 | if (OnChildAgentStatus != null) | ||
133 | { | ||
134 | OnChildAgentStatus(this.m_child); | ||
135 | } | ||
136 | } | ||
137 | 116 | ||
138 | public void KillClient() | 117 | public void KillClient() |
139 | { | 118 | { |
@@ -147,9 +126,7 @@ namespace OpenSim | |||
147 | } | 126 | } |
148 | 127 | ||
149 | this.m_inventoryCache.ClientLeaving(this.AgentID, null); | 128 | this.m_inventoryCache.ClientLeaving(this.AgentID, null); |
150 | 129 | m_world.RemoveAvatar(this.AgentId); | |
151 | |||
152 | // m_world.RemoveViewerAgent(this); | ||
153 | 130 | ||
154 | m_clientThreads.Remove(this.CircuitCode); | 131 | m_clientThreads.Remove(this.CircuitCode); |
155 | m_networkServer.RemoveClientCircuit(this.CircuitCode); | 132 | m_networkServer.RemoveClientCircuit(this.CircuitCode); |