aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorAdam Frisby2007-07-15 15:40:50 +0000
committerAdam Frisby2007-07-15 15:40:50 +0000
commit8fc1dfec792f3527c7f153bd49852519d561d17a (patch)
tree0aae20f07b43c4ac9a4f2d5fff3f7eb1619733ab /OpenSim/Region/ClientStack
parent* Typo in prebuild.xml (diff)
downloadopensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.zip
opensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.gz
opensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.bz2
opensim-SC-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.xz
* Added loading methods for NullStorage.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientViewBase.cs5
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs1
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 211ba8b..2bc3ed8 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -35,6 +35,7 @@ using libsecondlife;
35using libsecondlife.Packets; 35using libsecondlife.Packets;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
38using OpenSim.Region.Environment;
38 39
39namespace OpenSim.Region.ClientStack 40namespace OpenSim.Region.ClientStack
40{ 41{
@@ -69,7 +70,7 @@ namespace OpenSim.Region.ClientStack
69 protected virtual void ProcessOutPacket(Packet Pack) 70 protected virtual void ProcessOutPacket(Packet Pack)
70 { 71 {
71 // Keep track of when this packet was sent out 72 // Keep track of when this packet was sent out
72 Pack.TickCount = Environment.TickCount; 73 Pack.TickCount = System.Environment.TickCount;
73 74
74 // Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString()); 75 // Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());
75 76
@@ -245,7 +246,7 @@ namespace OpenSim.Region.ClientStack
245 246
246 protected void ResendUnacked() 247 protected void ResendUnacked()
247 { 248 {
248 int now = Environment.TickCount; 249 int now = System.Environment.TickCount;
249 250
250 lock (NeedAck) 251 lock (NeedAck)
251 { 252 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 1e99c71..622b89c 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework.Servers;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Physics.Manager; 37using OpenSim.Physics.Manager;
38using OpenSim.Region.Caches; 38using OpenSim.Region.Caches;
39using OpenSim.Region.Environment;
39 40
40namespace OpenSim.Region.ClientStack 41namespace OpenSim.Region.ClientStack
41{ 42{