aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Framework
diff options
context:
space:
mode:
authorMelanie2012-10-17 23:50:48 +0100
committerMelanie2012-10-17 23:50:48 +0100
commit9b684468113cf4933816adae3a53d8ac6d94b173 (patch)
treeea622759f04cd81746b597398f6c66a4f219ea87 /OpenSim/Region/OptionalModules/Framework
parentMerge branch 'avination' into careminster (diff)
parentExplicitly return only the incoming AgentUpdate packet as this is the only on... (diff)
downloadopensim-SC_OLD-9b684468113cf4933816adae3a53d8ac6d94b173.zip
opensim-SC_OLD-9b684468113cf4933816adae3a53d8ac6d94b173.tar.gz
opensim-SC_OLD-9b684468113cf4933816adae3a53d8ac6d94b173.tar.bz2
opensim-SC_OLD-9b684468113cf4933816adae3a53d8ac6d94b173.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Framework')
0 files changed, 0 insertions, 0 deletions