diff options
| author | Melanie | 2011-11-11 23:43:18 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-11 23:43:18 +0000 |
| commit | a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e (patch) | |
| tree | f19e00c12dfe753ee218eccd98b5a21304018247 /OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Make log messages on authentication failure more explicit (diff) | |
| download | opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.zip opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.gz opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.bz2 opensim-SC-a4ec97cfddc6baeed2eb5ed08240a7f9fb300d1e.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/SimulationServiceInConnector.cs')
0 files changed, 0 insertions, 0 deletions