aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
diff options
context:
space:
mode:
authorMelanie2012-07-16 22:22:42 +0100
committerMelanie2012-07-16 22:22:42 +0100
commitc256447f46db1738131763960c9394f03b072c46 (patch)
tree277255a693b3ce62366816338482a602d7d979bf /OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
parentMerge branch 'master' into careminster (diff)
parentAllow setting linked avatar positions from within a prim not the one sat on (diff)
downloadopensim-SC-c256447f46db1738131763960c9394f03b072c46.zip
opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.gz
opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.bz2
opensim-SC-c256447f46db1738131763960c9394f03b072c46.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-21 09:47:16 +0000