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/Services/UserAccountService | |
| 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/Services/UserAccountService')
| -rw-r--r-- | OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs b/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs index 24e1d16..576ccce 100644 --- a/OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/UserAccountService/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/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index a281b3b..5b4d040 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -545,7 +545,7 @@ namespace OpenSim.Services.UserAccountService | |||
| 545 | return account; | 545 | return account; |
| 546 | } | 546 | } |
| 547 | 547 | ||
| 548 | private void CreateDefaultAppearanceEntries(UUID principalID) | 548 | protected void CreateDefaultAppearanceEntries(UUID principalID) |
| 549 | { | 549 | { |
| 550 | m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID); | 550 | m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID); |
| 551 | 551 | ||