diff options
| author | Melanie | 2012-08-16 02:46:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-16 02:46:48 +0100 |
| commit | 90ad98370aead53e886832a83a3e8793f361426e (patch) | |
| tree | b7076c5fb7ecf75d1ad31f7756543ade8fbf1b49 /OpenSim/Region/Physics/Manager | |
| parent | Remove AreUpdatesSuspended flag because it does nothing (diff) | |
| parent | Do a proper null check to avoid the overloaded operator == trap (diff) | |
| download | opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.zip opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.gz opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.bz2 opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
0 files changed, 0 insertions, 0 deletions