diff options
| author | Melanie | 2013-03-06 00:15:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-06 00:15:54 +0000 |
| commit | 339d8ef2a657dd08bc6328da6e285b8550d05a74 (patch) | |
| tree | 612080502d4da19051a2fcc8dfb7ff26a90fbfa7 /OpenSim/Framework/IAssetLoader.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Limit each attachment point to 5 items as per spec (diff) | |
| download | opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.zip opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.gz opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.bz2 opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Framework/IAssetLoader.cs')
0 files changed, 0 insertions, 0 deletions