aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
diff options
context:
space:
mode:
authorMelanie2012-05-09 00:43:33 +0100
committerMelanie2012-05-09 00:43:33 +0100
commit50321fb7bf6472c4edfe574a2ba0113c0d4cd3be (patch)
treeb93dce1de50843d68b1daffbe3afc3903beee2fb /OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
parentMerge branch 'master' into careminster (diff)
parentRemove physics actor related race conditions in SetVehicleFlags() and SetPhys... (diff)
downloadopensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.zip
opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.tar.gz
opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.tar.bz2
opensim-SC-50321fb7bf6472c4edfe574a2ba0113c0d4cd3be.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-26 01:49:57 +0000