diff options
| author | Melanie | 2012-07-11 03:56:50 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-11 03:56:50 +0100 |
| commit | 0bc8238a6c25bc42438caee0cf42deec00f26b8e (patch) | |
| tree | a046cace418e2e7714818c60242698d0dd9cb4f4 /OpenSim.FxCop | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | If a part has a sit target and an avatar is already sitting, allow another av... (diff) | |
| download | opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.zip opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.gz opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.bz2 opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim.FxCop')
0 files changed, 0 insertions, 0 deletions