diff options
| author | Melanie | 2013-01-27 01:09:01 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-27 01:09:01 +0000 |
| commit | c3d68e7f9d91f202c0430faa78f59627ff796e3e (patch) | |
| tree | c8f306c455994112a11462d8c2286df45a975525 /OpenSim/Region/ClientStack/Linden | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent items being destroyed by rename operations. Renaming of a wearable also (diff) | |
| download | opensim-SC_OLD-c3d68e7f9d91f202c0430faa78f59627ff796e3e.zip opensim-SC_OLD-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.gz opensim-SC_OLD-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.bz2 opensim-SC_OLD-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
0 files changed, 0 insertions, 0 deletions