diff options
| author | Melanie | 2010-01-16 00:05:08 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-16 00:05:08 +0000 |
| commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
| tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Services/Interfaces | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | Add "create user" instructions to README.txt (diff) | |
| download | opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz | |
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 6b6b347..6186d80 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -42,7 +42,7 @@ namespace OpenSim.Services.Interfaces | |||
| 42 | /// <param name="regionInfos"> </param> | 42 | /// <param name="regionInfos"> </param> |
| 43 | /// <returns></returns> | 43 | /// <returns></returns> |
| 44 | /// <exception cref="System.Exception">Thrown if region registration failed</exception> | 44 | /// <exception cref="System.Exception">Thrown if region registration failed</exception> |
| 45 | bool RegisterRegion(UUID scopeID, GridRegion regionInfos); | 45 | string RegisterRegion(UUID scopeID, GridRegion regionInfos); |
| 46 | 46 | ||
| 47 | /// <summary> | 47 | /// <summary> |
| 48 | /// Deregister a region with the grid service. | 48 | /// Deregister a region with the grid service. |