diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/Framework/Interfaces | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ILandChannel.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs index 6fe6118..f71e31d 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs | |||
| @@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 60 | /// </summary> | 60 | /// </summary> |
| 61 | /// <param name="position"></param> | 61 | /// <param name="position"></param> |
| 62 | /// <returns></returns> | 62 | /// <returns></returns> |
| 63 | List<ILandObject> ParcelsNearPoint(Vector3 position); | 63 | List<ILandObject> ParcelsNearPoint(Vector3 position); |
| 64 | 64 | ||
| 65 | /// <summary> | 65 | /// <summary> |
| 66 | /// Get the parcel given the land's local id. | 66 | /// Get the parcel given the land's local id. |
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 1a8babc..991d60c 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
| @@ -34,7 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 34 | /// Interface to region archive functionality | 34 | /// Interface to region archive functionality |
| 35 | /// </summary> | 35 | /// </summary> |
| 36 | public interface IRegionArchiverModule | 36 | public interface IRegionArchiverModule |
| 37 | { | 37 | { |
| 38 | void HandleLoadOarConsoleCommand(string module, string[] cmdparams); | 38 | void HandleLoadOarConsoleCommand(string module, string[] cmdparams); |
| 39 | void HandleSaveOarConsoleCommand(string module, string[] cmdparams); | 39 | void HandleSaveOarConsoleCommand(string module, string[] cmdparams); |
| 40 | 40 | ||