diff options
| author | Melanie | 2012-10-16 04:30:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-16 04:30:01 +0100 |
| commit | fa52effb279355ef731725c04c3b659f972f3903 (patch) | |
| tree | 7d9029b0ded43814206112d5e5b2115b9b463fc7 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | Fix a merge issue (diff) | |
| parent | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. (diff) | |
| download | opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.zip opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.gz opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.bz2 opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
0 files changed, 0 insertions, 0 deletions