aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/PacketServer.cs
diff options
context:
space:
mode:
authorMW2007-08-16 16:57:30 +0000
committerMW2007-08-16 16:57:30 +0000
commit67873b8614e51fad759b3ba3de0dd0c2f9dba43f (patch)
treef3b1261aac15cb08c53dc69ecae205c35cb5137c /OpenSim/Region/ClientStack/PacketServer.cs
parentTaking Prims (SceneObjectGroups) in and out of inventory should now work and ... (diff)
downloadopensim-SC-67873b8614e51fad759b3ba3de0dd0c2f9dba43f.zip
opensim-SC-67873b8614e51fad759b3ba3de0dd0c2f9dba43f.tar.gz
opensim-SC-67873b8614e51fad759b3ba3de0dd0c2f9dba43f.tar.bz2
opensim-SC-67873b8614e51fad759b3ba3de0dd0c2f9dba43f.tar.xz
Deleted old inventoryCache.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/PacketServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 24bcfb1..66a7ffd 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
29using System.Net; 29using System.Net;
30using System.Net.Sockets; 30using System.Net.Sockets;
31using libsecondlife.Packets; 31using libsecondlife.Packets;
32using OpenSim.Assets;
33using OpenSim.Framework; 32using OpenSim.Framework;
34using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
35using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
@@ -122,9 +121,9 @@ namespace OpenSim.Region.ClientStack
122 121
123 } 122 }
124 123
125 protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions) 124 protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, AgentCircuitManager authenSessions)
126 { 125 {
127 return new ClientView(remoteEP, initialcirpack, clientThreads, scene, assetCache, packServer, inventoryCache, authenSessions ); 126 return new ClientView(remoteEP, initialcirpack, clientThreads, scene, assetCache, packServer, authenSessions );
128 } 127 }
129 128
130 /// <summary> 129 /// <summary>
@@ -136,10 +135,10 @@ namespace OpenSim.Region.ClientStack
136 /// <param name="inventoryCache"></param> 135 /// <param name="inventoryCache"></param>
137 /// <param name="authenticateSessionsClass"></param> 136 /// <param name="authenticateSessionsClass"></param>
138 /// <returns></returns> 137 /// <returns></returns>
139 public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AgentCircuitManager authenticateSessionsClass) 138 public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, AgentCircuitManager authenticateSessionsClass)
140 { 139 {
141 ClientView newuser = 140 ClientView newuser =
142 CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this, inventoryCache, 141 CreateNewClient(epSender, useCircuit, ClientThreads, _localScene, assetCache, this,
143 authenticateSessionsClass); 142 authenticateSessionsClass);
144 143
145 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); 144 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);