diff options
| author | Melanie | 2012-05-02 01:37:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-02 01:37:51 +0100 |
| commit | bf630fb808420c15abc100f11b993b9e6e1113c2 (patch) | |
| tree | 11a10a97e78725e96807c01a656123f934acb04a /OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | |
| parent | Merge branch 'avination' (diff) | |
| parent | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff) | |
| download | opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.zip opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.gz opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.bz2 opensim-SC-bf630fb808420c15abc100f11b993b9e6e1113c2.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs')
0 files changed, 0 insertions, 0 deletions