diff options
| author | Melanie | 2012-10-31 21:42:06 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-31 21:42:06 +0000 |
| commit | a2c60943240ad9af8fe2bd86d990f36fc26930ee (patch) | |
| tree | 15585e94e32082d7ac74bb341d82ce6bcccb8a57 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Also add the additional ScriptException constructor necessary to get [Seriali... (diff) | |
| download | opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.zip opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.gz opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.bz2 opensim-SC-a2c60943240ad9af8fe2bd86d990f36fc26930ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
0 files changed, 0 insertions, 0 deletions