diff options
author | Melanie | 2012-10-17 23:50:48 +0100 |
---|---|---|
committer | Melanie | 2012-10-17 23:50:48 +0100 |
commit | 9b684468113cf4933816adae3a53d8ac6d94b173 (patch) | |
tree | ea622759f04cd81746b597398f6c66a4f219ea87 /OpenSim/Services/Connectors/SimianGrid | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Explicitly return only the incoming AgentUpdate packet as this is the only on... (diff) | |
download | opensim-SC-9b684468113cf4933816adae3a53d8ac6d94b173.zip opensim-SC-9b684468113cf4933816adae3a53d8ac6d94b173.tar.gz opensim-SC-9b684468113cf4933816adae3a53d8ac6d94b173.tar.bz2 opensim-SC-9b684468113cf4933816adae3a53d8ac6d94b173.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
0 files changed, 0 insertions, 0 deletions