diff options
author | Justin Clarke Casey | 2008-01-28 19:49:07 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-28 19:49:07 +0000 |
commit | fa5fe6b7f6f187817ad166799f99fe2e5699fbf1 (patch) | |
tree | cad7d66b148ea366edb13b69059fbc11d6085414 | |
parent | * ODE Going to Time Step 0.020 = (1000\20) - ((1000\20) * .09) = ~45 pfps (diff) | |
download | opensim-SC-fa5fe6b7f6f187817ad166799f99fe2e5699fbf1.zip opensim-SC-fa5fe6b7f6f187817ad166799f99fe2e5699fbf1.tar.gz opensim-SC-fa5fe6b7f6f187817ad166799f99fe2e5699fbf1.tar.bz2 opensim-SC-fa5fe6b7f6f187817ad166799f99fe2e5699fbf1.tar.xz |
* Move AssetStatsReporter to Framework.Statistics
* The hooks are still plugged in too high at the asset server, but then next layer down is the database and this may be refactored soon.
* This change will requires a prebuild
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Statistics/AssetStatsReporter.cs (renamed from OpenSim/Grid/AssetServer/AssetStatsReporter.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 1 | ||||
-rw-r--r-- | prebuild.xml | 1 |
4 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Grid/AssetServer/AssetStatsReporter.cs b/OpenSim/Framework/Statistics/AssetStatsReporter.cs index ea5add5..ea5add5 100644 --- a/OpenSim/Grid/AssetServer/AssetStatsReporter.cs +++ b/OpenSim/Framework/Statistics/AssetStatsReporter.cs | |||
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 1e0dced..de16470 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -34,6 +34,7 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Framework.AssetLoader.Filesystem; | 34 | using OpenSim.Framework.AssetLoader.Filesystem; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Statistics; | ||
37 | 38 | ||
38 | namespace OpenSim.Grid.AssetServer | 39 | namespace OpenSim.Grid.AssetServer |
39 | { | 40 | { |
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 36dcdb0..6e4ae8f 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs | |||
@@ -35,6 +35,7 @@ using libsecondlife; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Statistics; | ||
38 | 39 | ||
39 | namespace OpenSim.Grid.AssetServer | 40 | namespace OpenSim.Grid.AssetServer |
40 | { | 41 | { |
diff --git a/prebuild.xml b/prebuild.xml index 9a5c798..f000455 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1050,6 +1050,7 @@ | |||
1050 | <Reference name="OpenSim.Framework.Console"/> | 1050 | <Reference name="OpenSim.Framework.Console"/> |
1051 | <Reference name="OpenSim.Framework.Servers"/> | 1051 | <Reference name="OpenSim.Framework.Servers"/> |
1052 | <Reference name="OpenSim.Framework.Communications"/> | 1052 | <Reference name="OpenSim.Framework.Communications"/> |
1053 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1053 | <Reference name="libsecondlife.dll"/> | 1054 | <Reference name="libsecondlife.dll"/> |
1054 | 1055 | ||
1055 | <Files> | 1056 | <Files> |