diff options
author | Melanie Thielker | 2014-11-10 20:22:49 +0100 |
---|---|---|
committer | Melanie Thielker | 2014-11-10 20:22:49 +0100 |
commit | 9516ebac244c7030233dba2edb556ca4c285b078 (patch) | |
tree | 378293301b9e187fc8821537e09d51e89a05e9d6 /OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs | |
parent | Second part of invisible base avatar option (diff) | |
parent | Bare minimum to get the new bake module to compile with this old code (diff) | |
download | opensim-SC-9516ebac244c7030233dba2edb556ca4c285b078.zip opensim-SC-9516ebac244c7030233dba2edb556ca4c285b078.tar.gz opensim-SC-9516ebac244c7030233dba2edb556ca4c285b078.tar.bz2 opensim-SC-9516ebac244c7030233dba2edb556ca4c285b078.tar.xz |
Merge branch 'avination-current'
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs')
0 files changed, 0 insertions, 0 deletions