aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie2010-08-07 05:41:41 +0100
committerMelanie2010-08-07 05:41:41 +0100
commit8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7 (patch)
treea9058df2a8b7b49944a01f718946e0d076758c15 /OpenSim/Services/Interfaces
parentCorrect display of landmark about info. Also correct region maturity rating (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.zip
opensim-SC_OLD-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.gz
opensim-SC_OLD-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.bz2
opensim-SC_OLD-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 94cee57..ac234dc 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -92,6 +92,7 @@ namespace OpenSim.Services.Interfaces
92 92
93 List<GridRegion> GetDefaultRegions(UUID scopeID); 93 List<GridRegion> GetDefaultRegions(UUID scopeID);
94 List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y); 94 List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
95 List<GridRegion> GetHyperlinks(UUID scopeID);
95 96
96 int GetRegionFlags(UUID scopeID, UUID regionID); 97 int GetRegionFlags(UUID scopeID, UUID regionID);
97 } 98 }