diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Client/Sirikata/SirikataModule.cs | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/Sirikata/SirikataModule.cs')
| -rw-r--r-- | OpenSim/Client/Sirikata/SirikataModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Client/Sirikata/SirikataModule.cs b/OpenSim/Client/Sirikata/SirikataModule.cs index cbb6c23..01dc9d7 100644 --- a/OpenSim/Client/Sirikata/SirikataModule.cs +++ b/OpenSim/Client/Sirikata/SirikataModule.cs | |||
| @@ -93,7 +93,7 @@ namespace OpenSim.Client.Sirikata | |||
| 93 | 93 | ||
| 94 | public void PostInitialise() | 94 | public void PostInitialise() |
| 95 | { | 95 | { |
| 96 | if(!m_enabled) | 96 | if (!m_enabled) |
| 97 | return; | 97 | return; |
| 98 | 98 | ||
| 99 | m_listener = new TcpListener(IPAddress.Any, 5943); | 99 | m_listener = new TcpListener(IPAddress.Any, 5943); |
| @@ -102,7 +102,7 @@ namespace OpenSim.Client.Sirikata | |||
| 102 | 102 | ||
| 103 | private void ListenLoop() | 103 | private void ListenLoop() |
| 104 | { | 104 | { |
| 105 | while(m_running) | 105 | while (m_running) |
| 106 | { | 106 | { |
| 107 | m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener); | 107 | m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener); |
| 108 | } | 108 | } |