diff options
| author | Melanie | 2012-10-30 01:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-30 01:02:20 +0000 |
| commit | 48569e856a9c9ced207652b10e2abde94c849687 (patch) | |
| tree | 8955c0206f1822f4bbb44466fae74e18923d125c /OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Make MeshAssetReceived private. (diff) | |
| download | opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.zip opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.gz opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2 opensim-SC-48569e856a9c9ced207652b10e2abde94c849687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
0 files changed, 0 insertions, 0 deletions