diff options
author | Melanie | 2011-10-25 02:26:56 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 02:26:56 +0100 |
commit | e2de57ca29116fd1dae77065104d7f431da711fc (patch) | |
tree | ad5ed1720690812044cbfc7fb6072283b4e144c7 /OpenSim/Framework | |
parent | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge (diff) | |
parent | Implement osNpcSit(). This is still in development so don't trust it (diff) | |
download | opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.zip opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.tar.gz opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.tar.bz2 opensim-SC-e2de57ca29116fd1dae77065104d7f431da711fc.tar.xz |
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions