diff options
| author | Melanie | 2013-08-02 00:23:40 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-02 00:23:40 +0100 |
| commit | b168d690bd32c3bbb28e65bccfa359ea89dc81f9 (patch) | |
| tree | 94604c44722a01f37b479e3edc8c20dff97f804a /OpenSim/Framework/Servers/ServerBase.cs | |
| parent | Make atachment state load work again (diff) | |
| parent | Make attachment state load work again (diff) | |
| download | opensim-SC-b168d690bd32c3bbb28e65bccfa359ea89dc81f9.zip opensim-SC-b168d690bd32c3bbb28e65bccfa359ea89dc81f9.tar.gz opensim-SC-b168d690bd32c3bbb28e65bccfa359ea89dc81f9.tar.bz2 opensim-SC-b168d690bd32c3bbb28e65bccfa359ea89dc81f9.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers/ServerBase.cs')
0 files changed, 0 insertions, 0 deletions