aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
diff options
context:
space:
mode:
authorMelanie2012-07-20 09:31:06 +0100
committerMelanie2012-07-20 09:31:06 +0100
commit7da744566d491a30c1baf99af39478518d75a6a9 (patch)
tree3f69ee9d45475fd4e8d09a85b0ab78150f3d9943 /OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
parentMerge branch 'master' into careminster (diff)
parentminor: switch around mixed up circuit code and endpoint data in "show connect... (diff)
downloadopensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.zip
opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.tar.gz
opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.tar.bz2
opensim-SC-7da744566d491a30c1baf99af39478518d75a6a9.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs')
0 files changed, 0 insertions, 0 deletions