diff options
| author | Melanie | 2013-01-19 21:49:33 +0100 |
|---|---|---|
| committer | Melanie | 2013-01-19 21:49:33 +0100 |
| commit | 2d3a57a002c74704501f4ce0f0359f2a19699eb5 (patch) | |
| tree | cc74ca02d7b8f8c9e63e4007c354f3296fe87392 /OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove group IM test code also mentioning "OpenSimulator Testing" (diff) | |
| download | opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.zip opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.gz opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.bz2 opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.xz | |
Merge branch 'avination'
Conflicts:
OpenSim/Framework/ThrottleOutPacketType.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs')
0 files changed, 0 insertions, 0 deletions