aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 5a60096..a91c35d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -33,7 +33,6 @@ using System.Threading;
33using System.Timers; 33using System.Timers;
34using libsecondlife; 34using libsecondlife;
35using libsecondlife.Packets; 35using libsecondlife.Packets;
36using OpenSim.Assets;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
39using OpenSim.Framework.Interfaces; 38using OpenSim.Framework.Interfaces;
@@ -69,13 +68,13 @@ namespace OpenSim.Region.ClientStack
69 public Thread ClientThread; 68 public Thread ClientThread;
70 public LLVector3 startpos; 69 public LLVector3 startpos;
71 70
72 private AgentAssetUpload UploadAssets; 71 //private AgentAssetUpload UploadAssets;
73 private LLUUID newAssetFolder = LLUUID.Zero; 72 private LLUUID newAssetFolder = LLUUID.Zero;
74 private bool debug = false; 73 private bool debug = false;
75 protected IScene m_scene; 74 protected IScene m_scene;
76 private Dictionary<uint, ClientView> m_clientThreads; 75 private Dictionary<uint, ClientView> m_clientThreads;
77 private AssetCache m_assetCache; 76 private AssetCache m_assetCache;
78 private InventoryCache m_inventoryCache; 77 // private InventoryCache m_inventoryCache;
79 private int cachedtextureserial = 0; 78 private int cachedtextureserial = 0;
80 protected AgentCircuitManager m_authenticateSessionsHandler; 79 protected AgentCircuitManager m_authenticateSessionsHandler;
81 private Encoding enc = Encoding.ASCII; 80 private Encoding enc = Encoding.ASCII;
@@ -85,7 +84,7 @@ namespace OpenSim.Region.ClientStack
85 private int probesWithNoIngressPackets = 0; 84 private int probesWithNoIngressPackets = 0;
86 private int lastPacketsReceived = 0; 85 private int lastPacketsReceived = 0;
87 86
88 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AgentCircuitManager authenSessions ) 87 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IScene scene, AssetCache assetCache, PacketServer packServer, AgentCircuitManager authenSessions )
89 { 88 {
90 m_moneyBalance = 1000; 89 m_moneyBalance = 1000;
91 90
@@ -94,7 +93,7 @@ namespace OpenSim.Region.ClientStack
94 m_assetCache = assetCache; 93 m_assetCache = assetCache;
95 94
96 m_networkServer = packServer; 95 m_networkServer = packServer;
97 m_inventoryCache = inventoryCache; 96 // m_inventoryCache = inventoryCache;
98 m_authenticateSessionsHandler = authenSessions; 97 m_authenticateSessionsHandler = authenSessions;
99 98
100 MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request"); 99 MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
@@ -105,7 +104,7 @@ namespace OpenSim.Region.ClientStack
105 104
106 PacketQueue = new BlockingQueue<QueItem>(); 105 PacketQueue = new BlockingQueue<QueItem>();
107 106
108 this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache); 107 //this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
109 AckTimer = new Timer(500); 108 AckTimer = new Timer(500);
110 AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); 109 AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
111 AckTimer.Start(); 110 AckTimer.Start();