From 39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 26 Jul 2007 14:55:42 +0000 Subject: * Started renaming world to Scene * Update and UpdateMovement now first stores array to avoid collection update exceptions * Ignored some bins --- OpenSim/Region/ClientStack/ClientView.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ClientStack/ClientView.cs') diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 3fd3a46..92d73e1 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -72,7 +72,7 @@ namespace OpenSim.Region.ClientStack private AgentAssetUpload UploadAssets; private LLUUID newAssetFolder = LLUUID.Zero; private bool debug = false; - protected IWorld m_world; + protected IScene m_scene; private Dictionary m_clientThreads; private AssetCache m_assetCache; private InventoryCache m_inventoryCache; @@ -85,9 +85,9 @@ namespace OpenSim.Region.ClientStack private int probesWithNoIngressPackets = 0; private int lastPacketsReceived = 0; - public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions ) + public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions ) { - m_world = world; + m_scene = scene; m_clientThreads = clientThreads; m_assetCache = assetCache; @@ -121,7 +121,7 @@ namespace OpenSim.Region.ClientStack { clientPingTimer.Stop(); this.m_inventoryCache.ClientLeaving(this.AgentID, null); - m_world.RemoveClient(this.AgentId); + m_scene.RemoveClient(this.AgentId); m_clientThreads.Remove(this.CircuitCode); m_networkServer.RemoveClientCircuit(this.CircuitCode); @@ -231,8 +231,8 @@ namespace OpenSim.Region.ClientStack clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity); clientPingTimer.Enabled = true; - MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); - this.m_world.AddNewClient(this, false); + MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene"); + this.m_scene.AddNewClient(this, false); } protected virtual void AuthUser() -- cgit v1.1