diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Capabilities/LLSDAvatarPicker.cs | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDAvatarPicker.cs')
0 files changed, 0 insertions, 0 deletions