diff options
| author | Melanie | 2012-03-09 02:39:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-09 02:39:14 +0000 |
| commit | dc5f831ca8bcaed77b65934a1c6d70c315a3834a (patch) | |
| tree | 5f45c7e163096ef23f5139b9ddd3566a3621cd03 /share | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Simplify minimap coarse location code by just reference SP.AbsolutePosition (diff) | |
| download | opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.zip opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.gz opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.bz2 opensim-SC-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'share')
0 files changed, 0 insertions, 0 deletions