diff options
| author | Melanie | 2013-02-07 01:40:11 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 01:40:11 +0000 |
| commit | 375114bea37a017af553595d3a6f9d269acac1c5 (patch) | |
| tree | 41cdd67221bc0b1af5e6bd886338a0e90d2c856e /OpenSim/Region/UserStatistics/WebStatsModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.zip opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.tar.gz opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.tar.bz2 opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/UserStatistics/WebStatsModule.cs')
| -rw-r--r-- | OpenSim/Region/UserStatistics/WebStatsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 438ef48..b98b762 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs | |||
| @@ -420,7 +420,7 @@ namespace OpenSim.Region.UserStatistics | |||
| 420 | Encoding encoding = Encoding.ASCII; | 420 | Encoding encoding = Encoding.ASCII; |
| 421 | int sizeOfChar = encoding.GetByteCount("\n"); | 421 | int sizeOfChar = encoding.GetByteCount("\n"); |
| 422 | byte[] buffer = encoding.GetBytes("\n"); | 422 | byte[] buffer = encoding.GetBytes("\n"); |
| 423 | string logfile = Util.logDir() + "/" + "OpenSim.log"; | 423 | string logfile = Util.logFile(); |
| 424 | FileStream fs = new FileStream(logfile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); | 424 | FileStream fs = new FileStream(logfile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); |
| 425 | Int64 tokenCount = 0; | 425 | Int64 tokenCount = 0; |
| 426 | Int64 endPosition = fs.Length / sizeOfChar; | 426 | Int64 endPosition = fs.Length / sizeOfChar; |