diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Services/Interfaces | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index cdcb961..3f4c958 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -100,6 +100,19 @@ namespace OpenSim.Services.Interfaces | |||
| 100 | List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y); | 100 | List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y); |
| 101 | List<GridRegion> GetHyperlinks(UUID scopeID); | 101 | List<GridRegion> GetHyperlinks(UUID scopeID); |
| 102 | 102 | ||
| 103 | /// <summary> | ||
| 104 | /// Get internal OpenSimulator region flags. | ||
| 105 | /// </summary> | ||
| 106 | /// <remarks> | ||
| 107 | /// See OpenSimulator.Framework.RegionFlags. These are not returned in the GridRegion structure - | ||
| 108 | /// they currently need to be requested separately. Possibly this should change to avoid multiple service calls | ||
| 109 | /// in some situations. | ||
| 110 | /// </remarks> | ||
| 111 | /// <returns> | ||
| 112 | /// The region flags. | ||
| 113 | /// </returns> | ||
| 114 | /// <param name='scopeID'></param> | ||
| 115 | /// <param name='regionID'></param> | ||
| 103 | int GetRegionFlags(UUID scopeID, UUID regionID); | 116 | int GetRegionFlags(UUID scopeID, UUID regionID); |
| 104 | } | 117 | } |
| 105 | 118 | ||