diff options
| author | Melanie | 2012-08-14 02:11:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-14 02:11:13 +0100 |
| commit | 053e7279ca5d9be8f2ae2f79d0a2c74ab056f147 (patch) | |
| tree | 772fd824cbbe5a6bc594875ac3ee03c00115cef5 /bin/assets/TexturesAssetSet/defaultalpha.jp2 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Implement the temp attachments. UNTESTED (diff) | |
| download | opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.zip opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.gz opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.bz2 opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/assets/TexturesAssetSet/defaultalpha.jp2')
0 files changed, 0 insertions, 0 deletions