diff options
author | Adam Frisby | 2007-07-15 15:40:50 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-15 15:40:50 +0000 |
commit | 8fc1dfec792f3527c7f153bd49852519d561d17a (patch) | |
tree | 0aae20f07b43c4ac9a4f2d5fff3f7eb1619733ab /OpenSim/Region/ClientStack | |
parent | * Typo in prebuild.xml (diff) | |
download | opensim-SC_OLD-8fc1dfec792f3527c7f153bd49852519d561d17a.zip opensim-SC_OLD-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.gz opensim-SC_OLD-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.bz2 opensim-SC_OLD-8fc1dfec792f3527c7f153bd49852519d561d17a.tar.xz |
* Added loading methods for NullStorage.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientViewBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 1 |
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; | |||
35 | using libsecondlife.Packets; | 35 | using libsecondlife.Packets; |
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
38 | using OpenSim.Region.Environment; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.ClientStack | 40 | namespace 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; | |||
36 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
37 | using OpenSim.Physics.Manager; | 37 | using OpenSim.Physics.Manager; |
38 | using OpenSim.Region.Caches; | 38 | using OpenSim.Region.Caches; |
39 | using OpenSim.Region.Environment; | ||
39 | 40 | ||
40 | namespace OpenSim.Region.ClientStack | 41 | namespace OpenSim.Region.ClientStack |
41 | { | 42 | { |