diff options
| author | Melanie | 2012-03-26 03:22:26 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-26 03:22:26 +0100 |
| commit | e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8 (patch) | |
| tree | 533f2d6ddc1ee64d2a34603d54322ae5b32ff1c4 /OpenSim/Capabilities/LLSDAssetUploadRequest.cs | |
| parent | Dynamically create the delegate type to reduce complexity in the caller (diff) | |
| parent | Further simplify ScriptComms (diff) | |
| download | opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.zip opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.tar.gz opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.tar.bz2 opensim-SC_OLD-e05c72d32f6d87f13080991e1a7dd5c17a2c8bd8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDAssetUploadRequest.cs')
0 files changed, 0 insertions, 0 deletions