diff options
| author | Melanie | 2012-06-07 23:33:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-07 23:33:40 +0100 |
| commit | e8cd9fbbb748aed1caac4a5d20d7e723351349dd (patch) | |
| tree | b901dfb2ebf4237a77aeebf1fbb929456a615693 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Remove a null ref when an avatar's attachment gets the avatar velocity (diff) | |
| parent | Record the fact that child agents can have asset transactions. (diff) | |
| download | opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.zip opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.gz opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.bz2 opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
0 files changed, 0 insertions, 0 deletions