diff options
| author | teravus | 2013-02-07 10:28:26 -0500 |
|---|---|---|
| committer | teravus | 2013-02-07 10:50:17 -0500 |
| commit | 94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch) | |
| tree | f2329adf59b6525528db1e7e099e8beddaf39a6d /OpenSim/Region/UserStatistics | |
| parent | This is the final commit that enables the Websocket handler (diff) | |
| parent | Rename "Bounciness" to "Restitution" (diff) | |
| download | opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.zip opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.gz opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.bz2 opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.xz | |
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
Diffstat (limited to 'OpenSim/Region/UserStatistics')
| -rw-r--r-- | OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/UserStatistics/WebStatsModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs index 100cf99..caa6d4e 100644 --- a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs | |||
| @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
| 29 | // Build Number | 29 | // Build Number |
| 30 | // Revision | 30 | // Revision |
| 31 | // | 31 | // |
| 32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
| 33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | [assembly: AssemblyFileVersion("1.0.0.0")] |
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; |