aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2012-03-31 02:18:02 +0100
committerMelanie2012-03-31 02:18:02 +0100
commitf3132c45d98af7bb38251ad95013c433b5eda9e5 (patch)
treeefc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
parentMerge branch 'master' into careminster (diff)
parentrefactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff)
downloadopensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip
opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz
opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2
opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-16 20:55:11 +0000