diff options
| author | Melanie | 2009-10-15 21:14:13 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-15 21:14:13 +0100 |
| commit | 6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch) | |
| tree | ffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Client/MXP/PacketHandler | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff) | |
| download | opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2 opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Client/MXP/PacketHandler')
| -rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 4910ab1..ba9c653 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
| @@ -339,12 +339,6 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
| 339 | m_clients.Add(client); | 339 | m_clients.Add(client); |
| 340 | m_log.Debug("[MXP ClientStack]: Created ClientView."); | 340 | m_log.Debug("[MXP ClientStack]: Created ClientView."); |
| 341 | 341 | ||
| 342 | |||
| 343 | m_log.Debug("[MXP ClientStack]: Adding ClientView to Scene..."); | ||
| 344 | scene.ClientManager.Add(client.CircuitCode, client); | ||
| 345 | m_log.Debug("[MXP ClientStack]: Added ClientView to Scene."); | ||
| 346 | |||
| 347 | |||
| 348 | client.MXPSendSynchronizationBegin(m_scenes[new UUID(joinRequestMessage.BubbleId)].SceneContents.GetTotalObjectsCount()); | 342 | client.MXPSendSynchronizationBegin(m_scenes[new UUID(joinRequestMessage.BubbleId)].SceneContents.GetTotalObjectsCount()); |
| 349 | 343 | ||
| 350 | m_log.Debug("[MXP ClientStack]: Starting ClientView..."); | 344 | m_log.Debug("[MXP ClientStack]: Starting ClientView..."); |